[pypy-svn] r34694 - pypy/dist/pypy/objspace/std

[fijal at codespeak.net]

Author: fijal
Date: Thu Nov 16 21:37:30 2006
New Revision: 34694

Modified:
   pypy/dist/pypy/objspace/std/transparent.py
Log:
Trying to make annotator happy.


Modified: pypy/dist/pypy/objspace/std/transparent.py
==============================================================================
--- pypy/dist/pypy/objspace/std/transparent.py	(original)
+++ pypy/dist/pypy/objspace/std/transparent.py	Thu Nov 16 21:37:30 2006
@@ -36,10 +36,11 @@
           "be wrapped (YET)" % w_type.getname(space, "?")))
 
 def proxy_controller(space, w_object):
-    if (not isinstance(w_object, W_Transparent)) and \
-        (not isinstance(w_object, W_TransparentObject)):
-        return None
-    return w_object.w_controller
+    if isinstance(w_object, W_Transparent):
+        return w_object.w_controller
+    if isinstance(w_object, W_TransparentObject):
+        return w_object.w_controller
+    return None
 
 app_proxy = gateway.interp2app(proxy, unwrap_spec=[gateway.ObjSpace, gateway.W_Root, \
     gateway.W_Root])