Mergery

gregmalcolm · gregmalcolm · commit 414b88d554e2 · 2012-10-27T17:42:24.000-04:00
diff --git a/python2/koans/about_sets.py b/python2/koans/about_sets.py
@@ -8,22 +8,22 @@ class AboutSets(Koan):
     def test_sets_make_keep_lists_unique(self):
         highlanders = ['MacLeod', 'Ramirez', 'MacLeod', 'Matunas',
             'MacLeod', 'Malcolm', 'MacLeod']
-        
+
         there_can_only_be_only_one = set(highlanders)
 
         self.assertEqual(__, there_can_only_be_only_one)
 
     def test_sets_are_unordered(self):
         self.assertEqual(set([__, __, __, __, __]), set('12345'))
-        
+
     def test_convert_the_set_into_a_list_to_sort_it(self):
         self.assertEqual(__, sorted(set('13245')))
-        
+
     # ------------------------------------------------------------------
 
     def test_set_have_arithmetic_operators(self):
-        scotsmen = set(["MacLeod","Wallace","Willie"])
-        warriors = set(["MacLeod", "Wallace", "Leonidas"])
+        scotsmen = set(['MacLeod', "Wallace', 'Willie'])
+        warriors = set(['MacLeod', "Wallace', 'Leonidas'])
 
         self.assertEqual(__, scotsmen - warriors)
         self.assertEqual(__, scotsmen | warriors)
@@ -35,9 +35,9 @@ def test_set_have_arithmetic_operators(self):
     def test_we_can_query_set_membership(self):
         self.assertEqual(__, 127 in set([127, 0, 0, 1]))
         self.assertEqual(__, 'cow' not in set('apocalypse now'))
-        
+
     def test_we_can_compare_subsets(self):
         self.assertEqual(__, set('cake') <= set('cherry cake'))
         self.assertEqual(__, set('cake').issubset(set('cherry cake')))
-        
+
         self.assertEqual(__, set('cake') > set('pie'))
diff --git a/python3/koans/about_sets.py b/python3/koans/about_sets.py
@@ -32,17 +32,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)
 
     # ------------------------------------------------------------------
 
