[pypy-svn] r34228 - in pypy/branch/transparent-proxy/pypy/objspace/std: . test

[fijal at codespeak.net]

Author: fijal
Date: Sun Nov  5 12:38:38 2006
New Revision: 34228

Modified:
   pypy/branch/transparent-proxy/pypy/objspace/std/model.py
   pypy/branch/transparent-proxy/pypy/objspace/std/proxyobject.py
   pypy/branch/transparent-proxy/pypy/objspace/std/test/test_proxy_internals.py
   pypy/branch/transparent-proxy/pypy/objspace/std/transparent.py
Log:
Reverted TransparentType object.


Modified: pypy/branch/transparent-proxy/pypy/objspace/std/model.py
==============================================================================
--- pypy/branch/transparent-proxy/pypy/objspace/std/model.py	(original)
+++ pypy/branch/transparent-proxy/pypy/objspace/std/model.py	Sun Nov  5 12:38:38 2006
@@ -123,7 +123,6 @@
         # xxx config
         self.typeorder[proxyobject.W_TransparentList] = []
         self.typeorder[proxyobject.W_TransparentDict] = []
-        self.typeorder[proxyobject.W_TransparentType] = []
 
         if config.objspace.std.withstrdict:
             del self.typeorder[dictobject.W_DictObject]

Modified: pypy/branch/transparent-proxy/pypy/objspace/std/proxyobject.py
==============================================================================
--- pypy/branch/transparent-proxy/pypy/objspace/std/proxyobject.py	(original)
+++ pypy/branch/transparent-proxy/pypy/objspace/std/proxyobject.py	Sun Nov  5 12:38:38 2006
@@ -92,10 +92,6 @@
 class W_TransparentGenerator(W_Transparent):
     typedef = GeneratorIterator.typedef
 
-class W_TransparentType(W_TransparentObject):
-    from pypy.objspace.std.typeobject import W_TypeObject as original
-    from pypy.objspace.std.typetype import type_typedef as typedef
-
 class W_TransparentList(W_TransparentObject):
     from pypy.objspace.std.listobject import W_ListObject as original
     from pypy.objspace.std.listtype import list_typedef as typedef
@@ -106,8 +102,6 @@
 
 registerimplementation(W_TransparentList)
 registerimplementation(W_TransparentDict)
-registerimplementation(W_TransparentType)
 
 register_type(W_TransparentList)
 register_type(W_TransparentDict)
-register_type(W_TransparentType)

Modified: pypy/branch/transparent-proxy/pypy/objspace/std/test/test_proxy_internals.py
==============================================================================
--- pypy/branch/transparent-proxy/pypy/objspace/std/test/test_proxy_internals.py	(original)
+++ pypy/branch/transparent-proxy/pypy/objspace/std/test/test_proxy_internals.py	Sun Nov  5 12:38:38 2006
@@ -96,7 +96,7 @@
         
         assert traceback.format_tb(last_tb) == traceback.format_tb(e[2])
 
-class AppTestProxyType(AppProxy):
+class DONTAppTestProxyType(AppProxy):
     def test_filetype(self):
         f = self.get_proxy(file)
         f("/tmp/sth", "w").write("aaa")
@@ -108,3 +108,16 @@
         fp.write("aaa")
         fp.close()
         assert open("/tmp/sth").read() == "aaa"
+
+    def test_isinstance(self):
+        class A:
+            pass
+
+        a = A()
+        Ap = self.get_proxy(A)
+        ap = self.get_proxy(a)
+        assert isinstance(a, A)
+        assert isinstance(a, Ap)
+        assert isinstance(ap, A)
+        assert isinstance(ap, Ap)
+        assert type(a) is type(ap)

Modified: pypy/branch/transparent-proxy/pypy/objspace/std/transparent.py
==============================================================================
--- pypy/branch/transparent-proxy/pypy/objspace/std/transparent.py	(original)
+++ pypy/branch/transparent-proxy/pypy/objspace/std/transparent.py	Sun Nov  5 12:38:38 2006
@@ -27,8 +27,6 @@
             return W_TransparentFrame(space, w_type, w_controller)
         if space.is_true(space.issubtype(w_type, space.gettypeobject(GeneratorIterator.typedef))):
             return W_TransparentGenerator(space, w_type, w_controller)
-        if isinstance(w_type, W_TypeObject):
-            return W_TransparentType(space, w_type, w_controller)
         if w_type.instancetypedef is space.w_object.instancetypedef:
             return W_Transparent(space, w_type, w_controller)
     else: