mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #3080: Use repr() to format the module name on error

Browse source
This commit is contained in:
Victor Stinner 2011-03-14 15:15:47 -04:00
parent ccbf475dfd
commit 98dbba5d20
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_pydoc.py
View file

@ -190,7 +190,7 @@ war</tt></dd></dl>
missing_pattern = "no Python documentation found for '%s'" missing_pattern = "no Python documentation found for '%s'"
# output pattern for module with bad imports # output pattern for module with bad imports
badimport_pattern = "problem in %s - ImportError: No module named %s" badimport_pattern = "problem in %s - ImportError: No module named %r"
def run_pydoc(module_name, *args): def run_pydoc(module_name, *args):
""" """

4
Lib/unittest/test/test_loader.py
View file

@ -239,7 +239,7 @@ class Test_TestLoader(unittest.TestCase):
try: try:
loader.loadTestsFromName('sdasfasfasdf') loader.loadTestsFromName('sdasfasfasdf')
except ImportError as e: except ImportError as e:
self.assertEqual(str(e), "No module named sdasfasfasdf") self.assertEqual(str(e), "No module named 'sdasfasfasdf'")
else: else:
self.fail("TestLoader.loadTestsFromName failed to raise ImportError") self.fail("TestLoader.loadTestsFromName failed to raise ImportError")
@ -619,7 +619,7 @@ class Test_TestLoader(unittest.TestCase):
try: try:
loader.loadTestsFromNames(['sdasfasfasdf']) loader.loadTestsFromNames(['sdasfasfasdf'])
except ImportError as e: except ImportError as e:
self.assertEqual(str(e), "No module named sdasfasfasdf") self.assertEqual(str(e), "No module named 'sdasfasfasdf'")
else: else:
self.fail("TestLoader.loadTestsFromNames failed to raise ImportError") self.fail("TestLoader.loadTestsFromNames failed to raise ImportError")

14
Python/import.c
View file

@ -1431,7 +1431,7 @@ load_source_module(PyObject *name, PyObject *pathname, FILE *fp)
goto error; goto error;
if (Py_VerboseFlag) if (Py_VerboseFlag)
PySys_FormatStderr("import %U # from %R\n", PySys_FormatStderr("import %U # from %R\n",
name, pathname); name, pathname);
if (cpathname != NULL) { if (cpathname != NULL) {
PyObject *ro = PySys_GetObject("dont_write_bytecode"); PyObject *ro = PySys_GetObject("dont_write_bytecode");
if (ro == NULL || !PyObject_IsTrue(ro)) if (ro == NULL || !PyObject_IsTrue(ro))
@ -1517,8 +1517,8 @@ load_package(PyObject *name, PyObject *pathname)
if (m == NULL) if (m == NULL)
return NULL; return NULL;
if (Py_VerboseFlag) if (Py_VerboseFlag)
PySys_FormatStderr("import %U # directory %U\n", PySys_FormatStderr("import %U # directory %R\n",
name, pathname); name, pathname);
file = get_sourcefile(pathname); file = get_sourcefile(pathname);
if (file == NULL) if (file == NULL)
return NULL; return NULL;
@ -1875,7 +1875,7 @@ find_module_path_list(PyObject *fullname, PyObject *name,
Py_DECREF(prefix); Py_DECREF(prefix);
} }
PyErr_Format(PyExc_ImportError, PyErr_Format(PyExc_ImportError,
"No module named %U", name); "No module named %R", name);
return NULL; return NULL;
} }
@ -2366,7 +2366,7 @@ load_module(PyObject *name, FILE *fp, PyObject *pathname, int type, PyObject *lo
default: default:
PyErr_Format(PyExc_ImportError, PyErr_Format(PyExc_ImportError,
"Don't know how to import %U (type code %d)", "Don't know how to import %R (type code %d)",
name, type); name, type);
m = NULL; m = NULL;
@ -3251,7 +3251,7 @@ PyImport_ReloadModule(PyObject *m)
return NULL; return NULL;
if (m != PyDict_GetItem(modules, nameobj)) { if (m != PyDict_GetItem(modules, nameobj)) {
PyErr_Format(PyExc_ImportError, PyErr_Format(PyExc_ImportError,
"reload(): module %U not in sys.modules", "reload(): module %R not in sys.modules",
nameobj); nameobj);
Py_DECREF(nameobj); Py_DECREF(nameobj);
return NULL; return NULL;
@ -3286,7 +3286,7 @@ PyImport_ReloadModule(PyObject *m)
parent = PyDict_GetItem(modules, parentname); parent = PyDict_GetItem(modules, parentname);
if (parent == NULL) { if (parent == NULL) {
PyErr_Format(PyExc_ImportError, PyErr_Format(PyExc_ImportError,
"reload(): parent %U not in sys.modules", "reload(): parent %R not in sys.modules",
parentname); parentname);
Py_DECREF(parentname); Py_DECREF(parentname);
goto error; goto error;