[pypy-svn] r57083 - in pypy/branch/isinstance-refactor/pypy/module/__builtin__: . test

[arigo at codespeak.net]

Author: arigo
Date: Thu Aug  7 19:50:51 2008
New Revision: 57083

Modified:
   pypy/branch/isinstance-refactor/pypy/module/__builtin__/abstractinst.py
   pypy/branch/isinstance-refactor/pypy/module/__builtin__/test/test_abstractinst.py
Log:
Test and fix.


Modified: pypy/branch/isinstance-refactor/pypy/module/__builtin__/abstractinst.py
==============================================================================
--- pypy/branch/isinstance-refactor/pypy/module/__builtin__/abstractinst.py	(original)
+++ pypy/branch/isinstance-refactor/pypy/module/__builtin__/abstractinst.py	Thu Aug  7 19:50:51 2008
@@ -135,7 +135,7 @@
     # -- case (class-like-object, tuple-of-classes)
     if space.is_true(space.isinstance(w_klass_or_tuple, space.w_tuple)):
         for w_klass in space.unpacktuple(w_klass_or_tuple):
-            if abstract_issubclass_w(w_derived, w_klass):
+            if abstract_issubclass_w(space, w_derived, w_klass):
                 return True
         return False
 

Modified: pypy/branch/isinstance-refactor/pypy/module/__builtin__/test/test_abstractinst.py
==============================================================================
--- pypy/branch/isinstance-refactor/pypy/module/__builtin__/test/test_abstractinst.py	(original)
+++ pypy/branch/isinstance-refactor/pypy/module/__builtin__/test/test_abstractinst.py	Thu Aug  7 19:50:51 2008
@@ -150,6 +150,9 @@
         assert issubclass(MyBaseInst, MyBaseInst)
         assert not issubclass(MyBaseInst, MyInst)
         assert not issubclass(MyInst, MyInst2)
+        assert issubclass(MyInst, (MyBaseInst, MyClass))
+        assert issubclass(MyInst, (MyClass, (), (MyBaseInst,)))
+        assert not issubclass(MyInst, (MyClass, (), (MyInst2,)))
 
         BBase = MyClass()
         BSub1 = MyClass()
@@ -179,4 +182,3 @@
         assert not issubclass(BSub1, BSub2)
         assert not issubclass(MyInst, BSub1)
         assert not issubclass(BSub1, MyInst)
-