Merged revisions 77789 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77789 | benjamin.peterson | 2010-01-26 20:16:42 -0600 (Tue, 26 Jan 2010) | 1 line

  raise a clear TypeError when trying to register a non-class
........
diff --git a/Lib/test/test_abc.py b/Lib/test/test_abc.py
index c9deb4b..a6e7062 100644
--- a/Lib/test/test_abc.py
+++ b/Lib/test/test_abc.py
@@ -139,6 +139,12 @@
         self.assertRaises(RuntimeError, C.register, A)  # cycles not allowed
         C.register(B)  # ok
 
+    def test_register_non_class(self):
+        class A(metaclass=abc.ABCMeta):
+            pass
+        self.assertRaisesRegexp(TypeError, "Can only register classes",
+                                A.register, 4)
+
     def test_registration_transitiveness(self):
         class A(metaclass=abc.ABCMeta):
             pass