[Python-checkins] r77789 - in python/trunk: Lib/abc.py Lib/test/test_abc.py Misc/NEWS

[benjamin.peterson]

Author: benjamin.peterson
Date: Wed Jan 27 03:16:42 2010
New Revision: 77789

Log:
raise a clear TypeError when trying to register a non-class

Modified:
   python/trunk/Lib/abc.py
   python/trunk/Lib/test/test_abc.py
   python/trunk/Misc/NEWS

Modified: python/trunk/Lib/abc.py
==============================================================================
--- python/trunk/Lib/abc.py	(original)
+++ python/trunk/Lib/abc.py	Wed Jan 27 03:16:42 2010
@@ -96,7 +96,7 @@
 
     def register(cls, subclass):
         """Register a virtual subclass of an ABC."""
-        if not isinstance(cls, type):
+        if not isinstance(subclass, type):
             raise TypeError("Can only register classes")
         if issubclass(subclass, cls):
             return  # Already a subclass

Modified: python/trunk/Lib/test/test_abc.py
==============================================================================
--- python/trunk/Lib/test/test_abc.py	(original)
+++ python/trunk/Lib/test/test_abc.py	Wed Jan 27 03:16:42 2010
@@ -149,6 +149,12 @@
         self.assertRaises(RuntimeError, C.register, A)  # cycles not allowed
         C.register(B)  # ok
 
+    def test_register_non_class(self):
+        class A(object):
+            __metaclass__ = abc.ABCMeta
+        self.assertRaisesRegexp(TypeError, "Can only register classes",
+                                A.register, 4)
+
     def test_registration_transitiveness(self):
         class A:
             __metaclass__ = abc.ABCMeta

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Wed Jan 27 03:16:42 2010
@@ -47,6 +47,8 @@
 Library
 -------
 
+- Issue #7792: Registering non-classes to ABCs raised an obscure error.
+
 - Removed the functions 'verify' and 'vereq' from Lib/test/test_support.py.
 
 - Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when