Author: Brian Kearns <[email protected]>
Branch:
Changeset: r70089:6002c93c0cc0
Date: 2014-03-19 07:01 -0400
http://bitbucket.org/pypy/pypy/changeset/6002c93c0cc0/
Log: fix reload/reimport of builtin modules (issue1514) (patch adapted
from yamt)
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -440,10 +440,11 @@
return name
- def getbuiltinmodule(self, name, force_init=False):
+ def getbuiltinmodule(self, name, force_init=False, reuse=True):
w_name = self.wrap(name)
w_modules = self.sys.get('modules')
if not force_init:
+ assert reuse is True
try:
return self.getitem(w_modules, w_name)
except OperationError, e:
@@ -459,10 +460,17 @@
"getbuiltinmodule() called with non-builtin module %s",
name)
else:
- # And initialize it
+ # Initialize the module
from pypy.interpreter.module import Module
if isinstance(w_mod, Module):
- w_mod.init(self)
+ if not reuse and w_mod.startup_called:
+ # Create a copy of the module
+ w_new = self.wrap(Module(self, w_name))
+ self.call_method(w_new.getdict(self), 'update',
+ w_mod.w_initialdict)
+ w_mod = w_new
+ else:
+ w_mod.init(self)
# Add the module to sys.modules
self.setitem(w_modules, w_name, w_mod)
diff --git a/pypy/module/imp/importing.py b/pypy/module/imp/importing.py
--- a/pypy/module/imp/importing.py
+++ b/pypy/module/imp/importing.py
@@ -579,7 +579,8 @@
return space.call_method(find_info.w_loader, "load_module",
w_modulename)
if find_info.modtype == C_BUILTIN:
- return space.getbuiltinmodule(find_info.filename, force_init=True)
+ return space.getbuiltinmodule(find_info.filename, force_init=True,
+ reuse=reuse)
if find_info.modtype in (PY_SOURCE, PY_COMPILED, C_EXTENSION,
PKG_DIRECTORY):
w_mod = None
diff --git a/pypy/module/imp/test/test_app.py b/pypy/module/imp/test/test_app.py
--- a/pypy/module/imp/test/test_app.py
+++ b/pypy/module/imp/test/test_app.py
@@ -203,7 +203,6 @@
def test_builtin_reimport(self):
# from https://bugs.pypy.org/issue1514
- skip("fix me")
import sys, marshal
old = marshal.loads
@@ -223,7 +222,6 @@
# taken from https://bugs.pypy.org/issue1514, with extra cases
# that show a difference with CPython: we can get on CPython
# several module objects for the same built-in module :-(
- skip("several built-in module objects: not supported by pypy")
import sys, marshal
old = marshal.loads
diff --git a/pypy/module/imp/test/test_import.py
b/pypy/module/imp/test/test_import.py
--- a/pypy/module/imp/test/test_import.py
+++ b/pypy/module/imp/test/test_import.py
@@ -578,7 +578,6 @@
assert hasattr(time, 'clock')
def test_reimport_builtin_simple_case_2(self):
- skip("fix me")
import sys, time
time.foo = "bar"
del sys.modules['time']
@@ -586,7 +585,6 @@
assert not hasattr(time, 'foo')
def test_reimport_builtin(self):
- skip("fix me")
import sys, time
oldpath = sys.path
time.tzset = "<test_reimport_builtin removed this>"
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
