Author: Manuel Jacob <m...@manueljacob.de>
Branch: py3k
Changeset: r82572:f564a192eb18
Date: 2016-02-26 19:13 +0100
http://bitbucket.org/pypy/pypy/changeset/f564a192eb18/
Log: hg merge default
Also, bring both test_shadow_extension_* tests closer to default.
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
@@ -41,7 +41,7 @@
test_reload = "def test():\n raise ValueError\n",
infinite_reload = "import infinite_reload, imp;
imp.reload(infinite_reload)",
del_sys_module = "import sys\ndel
sys.modules['del_sys_module']\n",
- itertools = "hello_world = 42\n",
+ _md5 = "hello_world = 42\n",
gc = "should_never_be_seen = 42\n",
)
root.ensure("notapackage", dir=1) # empty, no __init__.py
@@ -209,7 +209,7 @@
class AppTestImport(BaseImportTest):
spaceconfig = {
- "usemodules": ['time', 'struct'],
+ "usemodules": ['_md5', 'time', 'struct'],
}
def setup_class(cls):
@@ -732,13 +732,15 @@
def test_shadow_extension_1(self):
if self.runappdirect: skip("hard to test: module is already imported")
+ # 'import _md5' is supposed to find _md5.py if there is
+ # one in sys.path.
import sys
- sys.modules.pop('itertools', None)
- import itertools
- assert hasattr(itertools, 'hello_world')
- assert not hasattr(itertools, 'count')
- assert '(built-in)' not in repr(itertools)
- del sys.modules['itertools']
+ assert '_md5' not in sys.modules
+ import _md5
+ assert hasattr(_md5, 'hello_world')
+ assert not hasattr(_md5, 'md5')
+ assert '(built-in)' not in repr(_md5)
+ del sys.modules['_md5']
def test_shadow_extension_2(self):
if self.runappdirect: skip("hard to test: module is already imported")
@@ -748,16 +750,16 @@
# there is one in lib_pypy/_md5.py, which should not be seen
# either; hence the (built-in) test below.)
import sys
- sys.modules.pop('itertools', None)
+ assert '_md5' not in sys.modules
sys.path.append(sys.path.pop(0))
try:
- import itertools
- assert not hasattr(itertools, 'hello_world')
- assert hasattr(itertools, 'islice')
- assert '(built-in)' in repr(itertools)
+ import _md5
+ assert not hasattr(_md5, 'hello_world')
+ assert hasattr(_md5, 'md5')
+ assert '(built-in)' in repr(_md5)
finally:
sys.path.insert(0, sys.path.pop())
- del sys.modules['itertools']
+ del sys.modules['_md5']
def test_invalid_pathname(self):
import imp
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
