commit 3059caadc6329ba7d207b0c909bc33a361a432a8
author Benjamin Peterson <benjamin@python.org> Wed Jan 27 02:24:25 2010 +0000
committer Benjamin Peterson <benjamin@python.org> Wed Jan 27 02:24:25 2010 +0000
tree c7e3df0f11b3090ceceaeb0ad30151c6fab3e3ed
parent 01bd3ece5ca1ab29f756b7b07c2445d9ef570016

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

........
  r77788 | benjamin.peterson | 2010-01-26 20:15:28 -0600 (Tue, 26 Jan 2010) | 1 line

  for UserDict to be compatible with abcs, it must subclass object
........
  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
........

Lib/test/test_abc.py

diff --git a/Lib/test/test_abc.py b/Lib/test/test_abc.py
index 3e0955f..fa20173 100644
--- a/Lib/test/test_abc.py
+++ b/Lib/test/test_abc.py
@@ -149,6 +149,11 @@
         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.assertRaises(TypeError, A.register, 4)
+
     def test_registration_transitiveness(self):
         class A:
             __metaclass__ = abc.ABCMeta