diff options
author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-12-15 15:22:59 (GMT) |
---|---|---|
committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-12-15 15:22:59 (GMT) |
commit | ef9a43b2c97d91ab3343372d3e310136938ee505 (patch) | |
tree | a6a673ad6c9985b9e070891872ec7c8f466f4e87 | |
parent | 5cb8a31dc46db672ac442fcd78b5acc5dad74e91 (diff) | |
download | cpython-ef9a43b2c97d91ab3343372d3e310136938ee505.zip cpython-ef9a43b2c97d91ab3343372d3e310136938ee505.tar.gz cpython-ef9a43b2c97d91ab3343372d3e310136938ee505.tar.bz2 |
Rename test module names for #16421 to don't clash with other tests.
-rw-r--r-- | Lib/test/test_imp.py | 8 | ||||
-rw-r--r-- | Modules/_testimportmultiple.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py index bf2141f..52c4399 100644 --- a/Lib/test/test_imp.py +++ b/Lib/test/test_imp.py @@ -223,11 +223,11 @@ class ImportTests(unittest.TestCase): fileobj, pathname, description = imp.find_module(m) fileobj.close() mod0 = imp.load_dynamic(m, pathname) - mod1 = imp.load_dynamic('foo', pathname) - mod2 = imp.load_dynamic('bar', pathname) + mod1 = imp.load_dynamic('_testimportmultiple_foo', pathname) + mod2 = imp.load_dynamic('_testimportmultiple_bar', pathname) self.assertEqual(mod0.__name__, m) - self.assertEqual(mod1.__name__, 'foo') - self.assertEqual(mod2.__name__, 'bar') + self.assertEqual(mod1.__name__, '_testimportmultiple_foo') + self.assertEqual(mod2.__name__, '_testimportmultiple_bar') with self.assertRaises(ImportError): imp.load_dynamic('nonexistent', pathname) diff --git a/Modules/_testimportmultiple.c b/Modules/_testimportmultiple.c index baad29d..0ef573f 100644 --- a/Modules/_testimportmultiple.c +++ b/Modules/_testimportmultiple.c @@ -24,8 +24,8 @@ PyMODINIT_FUNC PyInit__testimportmultiple() static struct PyModuleDef _foomodule = { PyModuleDef_HEAD_INIT, - "foo", - "foo doc", + "_testimportmultiple_foo", + "_testimportmultiple_foo doc", -1, NULL, NULL, @@ -34,15 +34,15 @@ static struct PyModuleDef _foomodule = { NULL }; -PyMODINIT_FUNC PyInit_foo() +PyMODINIT_FUNC PyInit__testimportmultiple_foo() { return PyModule_Create(&_foomodule); } static struct PyModuleDef _barmodule = { PyModuleDef_HEAD_INIT, - "bar", - "bar doc", + "_testimportmultiple_bar", + "_testimportmultiple_bar doc", -1, NULL, NULL, @@ -51,7 +51,7 @@ static struct PyModuleDef _barmodule = { NULL }; -PyMODINIT_FUNC PyInit_bar(){ +PyMODINIT_FUNC PyInit__testimportmultiple_bar(){ return PyModule_Create(&_barmodule); } |