[pypy-commit] pypy default: Allow more faked objects when running py.py:

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: 
Changeset: r55929:6e5c61898b9d
Date: 2012-06-28 22:10 +0200
http://bitbucket.org/pypy/pypy/changeset/6e5c61898b9d/

Log:	Allow more faked objects when running py.py: with pypy-c,
	time.struct_time is a structseqtype: a custom metaclass which
	generates subclasses of tuple!

	Now py.py seems to work with a translated pypy.

diff --git a/pypy/objspace/std/fake.py b/pypy/objspace/std/fake.py
--- a/pypy/objspace/std/fake.py
+++ b/pypy/objspace/std/fake.py
@@ -50,7 +50,7 @@
     raise OperationError, OperationError(w_exc, w_value), tb
 
 def fake_type(cpy_type):
-    assert type(cpy_type) is type
+    assert isinstance(type(cpy_type), type)
     try:
         return _fake_type_cache[cpy_type]
     except KeyError:
@@ -100,12 +100,19 @@
     fake__new__.func_name = "fake__new__" + cpy_type.__name__
 
     kw['__new__'] = gateway.interp2app(fake__new__)
-    if cpy_type.__base__ is not object and not issubclass(cpy_type, Exception):
-        assert cpy_type.__base__ is basestring, cpy_type
+    if cpy_type.__base__ is object or issubclass(cpy_type, Exception):
+        base = None
+    elif cpy_type.__base__ is basestring:
         from pypy.objspace.std.basestringtype import basestring_typedef
         base = basestring_typedef
+    elif cpy_type.__base__ is tuple:
+        from pypy.objspace.std.tupletype import tuple_typedef
+        base = tuple_typedef
+    elif cpy_type.__base__ is type:
+        from pypy.objspace.std.typetype import type_typedef
+        base = type_typedef
     else:
-        base = None
+        raise NotImplementedError(cpy_type, cpy_type.__base__)
     class W_Fake(W_Object):
         typedef = StdTypeDef(
             cpy_type.__name__, base, **kw)