[pypy-svn] r8935 - pypy/branch/dist-simpler-multimethods/pypy/interpreter

[arigo at codespeak.net]

Author: arigo
Date: Sun Feb  6 21:06:13 2005
New Revision: 8935

Modified:
   pypy/branch/dist-simpler-multimethods/pypy/interpreter/gateway.py
   pypy/branch/dist-simpler-multimethods/pypy/interpreter/pycode.py
Log:
working...


Modified: pypy/branch/dist-simpler-multimethods/pypy/interpreter/gateway.py
==============================================================================
--- pypy/branch/dist-simpler-multimethods/pypy/interpreter/gateway.py	(original)
+++ pypy/branch/dist-simpler-multimethods/pypy/interpreter/gateway.py	Sun Feb  6 21:06:13 2005
@@ -14,7 +14,7 @@
 
 from pypy.tool import hack
 from pypy.interpreter.error import OperationError 
-from pypy.interpreter import eval, pycode
+from pypy.interpreter import eval
 from pypy.interpreter.function import Function, Method
 from pypy.interpreter.baseobjspace import W_Root,ObjSpace,Wrappable
 from pypy.interpreter.argument import Arguments
@@ -261,6 +261,7 @@
         # str,int,float: unwrap argument as such type
         
         # First extract the signature from the (CPython-level) code object
+        from pypy.interpreter import pycode
         argnames, varargname, kwargname = pycode.cpython_code_signature(func.func_code)
 
         if unwrap_spec is None:
@@ -467,6 +468,7 @@
 
     def getcode(self, space):
         "NOT_RPYTHON"
+        from pypy.interpreter import pycode
         code = pycode.PyCode(space)
         code._from_code(self._staticcode)
         return code

Modified: pypy/branch/dist-simpler-multimethods/pypy/interpreter/pycode.py
==============================================================================
--- pypy/branch/dist-simpler-multimethods/pypy/interpreter/pycode.py	(original)
+++ pypy/branch/dist-simpler-multimethods/pypy/interpreter/pycode.py	Sun Feb  6 21:06:13 2005
@@ -6,6 +6,7 @@
 
 import dis
 from pypy.interpreter import eval
+from pypy.interpreter.gateway import NoneNotWrapped
 from pypy.tool.cache import Cache 
 
 # helper
@@ -194,7 +195,8 @@
                           w_argcount, w_nlocals, w_stacksize, w_flags,
                           w_codestring, w_constants, w_names,
                           w_varnames, w_filename, w_name, w_firstlineno,
-                          w_lnotab, w_freevars=None, w_cellvars=None):
+                          w_lnotab, w_freevars=NoneNotWrapped,
+                          w_cellvars=NoneNotWrapped):
         code = space.allocate_instance(PyCode, w_subtype)
         code.__init__(space)
         # XXX typechecking everywhere!