Author: Ronan Lamy <[email protected]>
Branch: cpyext-cleanup
Changeset: r89374:68058ce4557d
Date: 2017-01-05 12:29 +0000
http://bitbucket.org/pypy/pypy/changeset/68058ce4557d/
Log: Remove unnecessary special-casing of cpyext in
space.setup_builtin_modules()
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -219,7 +219,7 @@
# cpyext types that may have only old buffer interface
w_impl = space.lookup(self, '__wbuffer__')
if w_impl is not None:
- w_result = space.get_and_call_function(w_impl, self,
+ w_result = space.get_and_call_function(w_impl, self,
space.newint(flags))
if space.isinstance_w(w_result, space.w_buffer):
return w_result.buffer_w(space, flags)
@@ -665,9 +665,6 @@
def setup_builtin_modules(self):
"NOT_RPYTHON: only for initializing the space."
- if self.config.objspace.usemodules.cpyext:
- from pypy.module.cpyext.state import State
- self.fromcache(State).build_api(self)
self.getbuiltinmodule('sys')
self.getbuiltinmodule('imp')
self.getbuiltinmodule('__builtin__')
diff --git a/pypy/module/cpyext/__init__.py b/pypy/module/cpyext/__init__.py
--- a/pypy/module/cpyext/__init__.py
+++ b/pypy/module/cpyext/__init__.py
@@ -13,12 +13,15 @@
atexit_funcs = []
+ def setup_after_space_initialization(self):
+ self.space.fromcache(State).build_api(self.space)
+
def startup(self, space):
space.fromcache(State).startup(space)
method = pypy.module.cpyext.typeobject.get_new_method_def(space)
w_obj = pypy.module.cpyext.methodobject.W_PyCFunctionObject(space,
method, space.wrap(''))
space.appexec([space.type(w_obj)], """(methodtype):
- from pickle import Pickler
+ from pickle import Pickler
Pickler.dispatch[methodtype] = Pickler.save_global
""")
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
