[pypy-svn] r31200 - pypy/dist/pypy/annotation/test

arigo at codespeak.net arigo at codespeak.net
Wed Aug 9 13:47:27 CEST 2006


Author: arigo
Date: Wed Aug  9 13:47:25 2006
New Revision: 31200

Modified:
   pypy/dist/pypy/annotation/test/test_model.py
Log:
pypy-c compliance.


Modified: pypy/dist/pypy/annotation/test/test_model.py
==============================================================================
--- pypy/dist/pypy/annotation/test/test_model.py	(original)
+++ pypy/dist/pypy/annotation/test/test_model.py	Wed Aug  9 13:47:25 2006
@@ -76,8 +76,12 @@
         pass
     class B2(object):
         pass
-    class B3(object, A0):
-        pass
+    try:
+        class B3(object, A0):
+            pass
+    except TypeError:    # if A0 is also a new-style class, e.g. in PyPy
+        class B3(A0, object):
+            pass
     assert commonbase(A1,A2) is A0 
     assert commonbase(A1,A0) is A0
     assert commonbase(A1,A1) is A1



More information about the Pypy-commit mailing list