1. Greg Malcolm
  2. python_koans

Commits

Greg Malcolm  committed 0d793ba

Merge github pull request #18 from boyan/master 'changed python2 and python3 about_dictionaries.py to better explain the difference between values and keys in dictionaries'

  • Participants
  • Parent commits 5a9e5bb
  • Branches default

Comments (0)

Files changed (2)

File python2/koans/about_dictionaries.py

View file
         
         self.assertEqual(____, dict1 == dict2)
         
-    def test_dictionary_keys(self):
+    def test_dictionary_keys_and_values(self):
         babel_fish = {'one': 'uno', 'two': 'dos'}
         self.assertEqual(__, len(babel_fish.keys()))
-        self.assertEqual(__, 'one' in babel_fish)
-        self.assertEqual(__, 'two' in babel_fish)
+        self.assertEqual(__, len(babel_fish.values()))
+        self.assertEqual(__, 'one' in babel_fish.keys())
+        self.assertEqual(__, 'two' in babel_fish.values())
+        self.assertEqual(__, 'uno' in babel_fish.keys())
+        self.assertEqual(__, 'dos' in babel_fish.values())
         self.assertEqual(list, babel_fish.keys().__class__)
-        
-    def test_dictionary_values(self):
-        babel_fish = {'one': 'uno', 'two': 'dos'}
-        self.assertEqual(__, len(babel_fish.values()))
-        self.assertEqual(__, 'uno' in babel_fish.values())
-        self.assertEqual(__, 'dos' in babel_fish.values())
+        self.assertEqual('dict_keys', babel_fish.keys().__class__.__name__)
         self.assertEqual(list, babel_fish.values().__class__)
-        
+        self.assertEqual('dict_values', babel_fish.values().__class__.__name__)
+
     def test_making_a_dictionary_from_a_sequence_of_keys(self):
         cards = {}.fromkeys(
             ('red warrior', 'green elf', 'blue valkyrie', 'yellow dwarf',

File python3/koans/about_dictionaries.py

View file
         
         self.assertEqual(__, dict1 == dict2)
         
-    def test_dictionary_keys(self):
-        babel_fish = { 'one': 'uno', 'two': 'dos' }
+       
+    def test_dictionary_keys_and_values(self):
+        babel_fish = {'one': 'uno', 'two': 'dos'}
         self.assertEqual(__, len(babel_fish.keys()))
-        self.assertEqual(__, 'one' in babel_fish) 
-        self.assertEqual(__, 'two' in babel_fish) 
+        self.assertEqual(__, len(babel_fish.values()))
+        self.assertEqual(__, 'one' in babel_fish.keys())
+        self.assertEqual(__, 'two' in babel_fish.values())
+        self.assertEqual(__, 'uno' in babel_fish.keys())
+        self.assertEqual(__, 'dos' in babel_fish.values())
+        self.assertEqual(list, babel_fish.keys().__class__)
         self.assertEqual('dict_keys', babel_fish.keys().__class__.__name__)
-        
-    def test_dictionary_values(self):
-        babel_fish = { 'one': 'uno', 'two': 'dos' }
-        self.assertEqual(__, len(babel_fish.values()))
-        self.assertEqual(__, 'uno' in babel_fish.values())
-        self.assertEqual(__, 'dos' in babel_fish.values())
+        self.assertEqual(lis, babel_fish.values().__class__)
         self.assertEqual('dict_values', babel_fish.values().__class__.__name__)
-        
+
     def test_making_a_dictionary_from_a_sequence_of_keys(self):
         cards = {}.fromkeys(('red warrior', 'green elf', 'blue valkyrie', 'yellow dwarf', 'confused looking zebra'), 42)