changed back a few __class__ tests to __class__.__name__ to avoid having to deal with those pesky namespaces

gregmalcolm · gregmalcolm · commit 9ae9cc7c3bf6 · 2013-08-07T21:43:15.000-04:00
diff --git a/python2/koans/about_attribute_access.py b/python2/koans/about_attribute_access.py
@@ -19,7 +19,7 @@ def test_calling_undefined_functions_normally_results_in_errors(self):
         try:
             typical.foobar()
         except Exception as exception:
-            self.assertEqual(__, exception.__class__)
+            self.assertEqual(__, exception.__class__.__name__)
             self.assertMatch(__, exception[0])
 
     def test_calling_getattribute_causes_an_attribute_error(self):
@@ -160,7 +160,7 @@ def test_getattr_only_catches_unknown_attributes(self):
         catcher.free_pie()
 
         self.assertEqual(__,
-            catcher.give_me_duff_or_give_me_death().__class__)
+            catcher.give_me_duff_or_give_me_death().__class__.__name__)
 
         self.assertEqual(__, catcher.no_of_getattr_calls)
 
diff --git a/python2/koans/about_classes.py b/python2/koans/about_classes.py
@@ -10,7 +10,7 @@ class Dog(object):
 
     def test_instances_of_classes_can_be_created_adding_parentheses(self):
         fido = self.Dog()
-        self.assertEqual(__, fido.__class__)
+        self.assertEqual(__, fido.__class__.__name__)
 
     def test_classes_have_docstrings(self):
         self.assertMatch(__, self.Dog.__doc__)
diff --git a/python2/koans/about_method_bindings.py b/python2/koans/about_method_bindings.py
@@ -77,8 +77,8 @@ def test_get_descriptor_resolves_attribute_binding(self):
         #   binding_owner = obj
         #   owner_type = cls
 
-        self.assertEqual(__, bound_obj.__class__)
-        self.assertEqual(__, binding_owner.__class__)
+        self.assertEqual(__, bound_obj.__class__.__name__)
+        self.assertEqual(__, binding_owner.__class__.__name__)
         self.assertEqual(AboutMethodBindings, owner_type)
 
     # ------------------------------------------------------------------
diff --git a/python2/koans/about_methods.py b/python2/koans/about_methods.py
@@ -22,7 +22,9 @@ def test_calling_functions_with_wrong_number_of_arguments(self):
         try:
             my_global_function()
         except Exception as exception:
-            self.assertEqual(__, exception.__class__)
+            # NOTE: The .__name__ attribute will convert the class
+            # into a string value.
+            self.assertEqual(__, exception.__class__.__name__)
             self.assertMatch(
                 r'my_global_function\(\) takes exactly 2 arguments \(0 given\)',
                 exception[0])
@@ -158,7 +160,7 @@ def test_double_underscore_attribute_prefixes_cause_name_mangling(self):
             #This may not be possible...
             password = rover.__password()
         except Exception as ex:
-            self.assertEqual(__, ex.__class__)
+            self.assertEqual(__, ex.__class__.__name__)
 
         # But this still is!
         self.assertEqual(__, rover._Dog__password())
diff --git a/python2/koans/about_new_style_classes.py b/python2/koans/about_new_style_classes.py
@@ -34,9 +34,7 @@ def test_new_style_classes_have_more_attributes(self):
     # ------------------------------------------------------------------
 
     def test_old_style_classes_have_type_but_no_class_attribute(self):
-        # Note: The .__name__ attribute will convert the type into a string
-        # value.
-        #self.assertEqual(__, type(self.OldStyleClass).__name__)
+        self.assertEqual(__, type(self.OldStyleClass).__name__)
 
         try:
             cls = self.OldStyleClass.__class__.__name__
diff --git a/python3/koans/about_classes.py b/python3/koans/about_classes.py
@@ -9,8 +9,10 @@ class Dog:
         "Dogs need regular walkies. Never, ever let them drive."
 
     def test_instances_of_classes_can_be_created_adding_parentheses(self):
+        # NOTE: The .__name__ attribute will convert the class
+        # into a string value.
         fido = self.Dog()
-        self.assertEqual(__, fido.__class__)
+        self.assertEqual(__, fido.__class__.__name__)
 
     def test_classes_have_docstrings(self):
         self.assertRegexpMatches(self.Dog.__doc__, __)
diff --git a/python3/koans/about_method_bindings.py b/python3/koans/about_method_bindings.py
@@ -68,8 +68,8 @@ def test_get_descriptor_resolves_attribute_binding(self):
         #   binding_owner = obj
         #   owner_type = cls
 
-        self.assertEqual(__, bound_obj.__class__)
-        self.assertEqual(__, binding_owner.__class__)
+        self.assertEqual(__, bound_obj.__class__.__name__)
+        self.assertEqual(__, binding_owner.__class__.__name__)
         self.assertEqual(AboutMethodBindings, owner_type)
 
     # ------------------------------------------------------------------
