Merge pull request gregmalcolm#28 from Ymbirtt/patch-2

gregmalcolm · gregmalcolm · commit 090ab49ff6aa · 2012-10-27T14:32:56.000-07:00
Change sets for set operators to be more intuitive
diff --git a/python2/koans/about_sets.py b/python2/koans/about_sets.py
@@ -21,17 +21,14 @@ def test_convert_the_set_into_a_list_to_sort_it(self):
         
     # ------------------------------------------------------------------
 
-    def chars_in(self, a_set):
-        return ''.join(sorted(a_set))
-
     def test_set_have_arithmetic_operators(self):
-        good_guy = set('macleod')
-        bad_guy = set('mutunas')
-        
-        self.assertEqual(__, self.chars_in(good_guy - bad_guy))
-        self.assertEqual(__, self.chars_in(good_guy | bad_guy))
-        self.assertEqual(__, self.chars_in(good_guy & bad_guy))
-        self.assertEqual(__, self.chars_in(good_guy ^ bad_guy))
+        scotsmen = set(["MacLeod","Wallace","Willie"])
+        warriors = set(["MacLeod", "Wallace", "Leonidas"])
+
+        self.assertEqual(__, scotsmen - warriors)
+        self.assertEqual(__, scotsmen | warriors)
+        self.assertEqual(__, scotsmen & warriors)
+        self.assertEqual(__, scotsmen ^ warriors)
 
     # ------------------------------------------------------------------
 
