Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r60491:5d354f43b715
Date: 2013-01-25 13:41 -0800
http://bitbucket.org/pypy/pypy/changeset/5d354f43b715/
Log: backout b1ab47f92c6e matching cpython 3.2 isn't important here
because importlib as import behaves like this anyway
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
@@ -650,7 +650,7 @@
else:
# ImportError
msg = "No module named %s"
- raise operationerrfmt(space.w_ImportError, msg, partname)
+ raise operationerrfmt(space.w_ImportError, msg, modulename)
@jit.dont_look_inside
def reload(space, w_module):
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
@@ -410,13 +410,13 @@
def imp():
from pkg import relative_f
exc = raises(ImportError, imp)
- assert exc.value.args[0] == "No module named imp"
+ assert exc.value.args[0] == "No module named pkg.imp"
def test_no_relative_import_bug(self):
def imp():
from pkg import relative_g
exc = raises(ImportError, imp)
- assert exc.value.args[0] == "No module named imp"
+ assert exc.value.args[0] == "No module named pkg.imp"
def test_future_relative_import_level_1(self):
from pkg import relative_c
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
