(original) (raw)

changeset: 80855:2e492a9a1845 user: Andrew Svetlov andrew.svetlov@gmail.com date: Sat Dec 15 17:22:59 2012 +0200 files: Lib/test/test_imp.py Modules/_testimportmultiple.c description: Rename test module names for #16421 to don't clash with other tests. diff -r 4c8d756196a4 -r 2e492a9a1845 Lib/test/test_imp.py --- a/Lib/test/test_imp.py Sat Dec 15 00:05:16 2012 -0500 +++ b/Lib/test/test_imp.py Sat Dec 15 17:22:59 2012 +0200 @@ -223,11 +223,11 @@ 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 -r 4c8d756196a4 -r 2e492a9a1845 Modules/_testimportmultiple.c --- a/Modules/_testimportmultiple.c Sat Dec 15 00:05:16 2012 -0500 +++ b/Modules/_testimportmultiple.c Sat Dec 15 17:22:59 2012 +0200 @@ -24,8 +24,8 @@ static struct PyModuleDef _foomodule = { PyModuleDef_HEAD_INIT, - "foo", - "foo doc", + "_testimportmultiple_foo", + "_testimportmultiple_foo doc", -1, NULL, NULL, @@ -34,15 +34,15 @@ 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 @@ NULL }; -PyMODINIT_FUNC PyInit_bar(){ +PyMODINIT_FUNC PyInit__testimportmultiple_bar(){ return PyModule_Create(&_barmodule); } /andrew.svetlov@gmail.com