]> granicus.if.org Git - python/commitdiff
Merged revisions 66144 via svnmerge from
authorNick Coghlan <ncoghlan@gmail.com>
Tue, 2 Sep 2008 10:43:28 +0000 (10:43 +0000)
committerNick Coghlan <ncoghlan@gmail.com>
Tue, 2 Sep 2008 10:43:28 +0000 (10:43 +0000)
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66144 | nick.coghlan | 2008-09-02 20:14:47 +1000 (Tue, 02 Sep 2008) | 1 line

  Issue 3747: Fix caching in ABCMeta.__subclasscheck__ (R: Georg Brandl)
........

Lib/abc.py

index 05ac7e451f8b6f76d0a8b9131fb87b0f4461ced9..8cfb54a0d3ab18ba480e3496337ff3bf5fcb7a5a 100644 (file)
@@ -159,12 +159,12 @@ class ABCMeta(type):
         # Check if it's a subclass of a registered class (recursive)
         for rcls in cls._abc_registry:
             if issubclass(subclass, rcls):
-                cls._abc_registry.add(subclass)
+                cls._abc_cache.add(subclass)
                 return True
         # Check if it's a subclass of a subclass (recursive)
         for scls in cls.__subclasses__():
             if issubclass(subclass, scls):
-                cls._abc_registry.add(subclass)
+                cls._abc_cache.add(subclass)
                 return True
         # No dice; update negative cache
         cls._abc_negative_cache.add(subclass)