[pypy-svn] r9138 - pypy/branch/dist-interpapp/pypy/objspace/flow

[arigo at codespeak.net]

Author: arigo
Date: Fri Feb 11 18:37:28 2005
New Revision: 9138

Modified:
   pypy/branch/dist-interpapp/pypy/objspace/flow/objspace.py
   pypy/branch/dist-interpapp/pypy/objspace/flow/specialcase.py
Log:
- a fix following the appdef() refactoring
- put a w_sys attribute on the flow object space, to allow some objects
    to be found as constants (e.g. sys.stdout in print statements).



Modified: pypy/branch/dist-interpapp/pypy/objspace/flow/objspace.py
==============================================================================
--- pypy/branch/dist-interpapp/pypy/objspace/flow/objspace.py	(original)
+++ pypy/branch/dist-interpapp/pypy/objspace/flow/objspace.py	Fri Feb 11 18:37:28 2005
@@ -52,6 +52,7 @@
         self.specialcases = {}
         #self.make_builtins()
         #self.make_sys()
+        self.w_sys = self.wrap(sys)
 
     def loadfromcache(self, key, builder, cache):
         # when populating the caches, the flow space switches to

Modified: pypy/branch/dist-interpapp/pypy/objspace/flow/specialcase.py
==============================================================================
--- pypy/branch/dist-interpapp/pypy/objspace/flow/specialcase.py	(original)
+++ pypy/branch/dist-interpapp/pypy/objspace/flow/specialcase.py	Fri Feb 11 18:37:28 2005
@@ -83,7 +83,7 @@
     return space.do_operation(opname, *args_w)
 
 def setup(space):
-    fn = pyframe.normalize_exception.get_function(space)
+    fn = pyframe.normalize_exception
     space.specialcases[fn] = sc_normalize_exception
     space.specialcases[__import__] = sc_import
     for opname in ['lt', 'le', 'eq', 'ne', 'gt', 'ge', 'is_']: