diff options
author | Christian Heimes <christian@cheimes.de> | 2007-11-27 21:50:00 (GMT) |
---|---|---|
committer | Christian Heimes <christian@cheimes.de> | 2007-11-27 21:50:00 (GMT) |
commit | 45f9af34b334b483678225a943578d2e1ea540b1 (patch) | |
tree | 07d42daf6094f704adb5b4322891601e91176ada /Lib/test/test_inspect.py | |
parent | 1c280ab7d62b4ae420964b655d99a8e4186320b3 (diff) | |
download | cpython-45f9af34b334b483678225a943578d2e1ea540b1.zip cpython-45f9af34b334b483678225a943578d2e1ea540b1.tar.gz cpython-45f9af34b334b483678225a943578d2e1ea540b1.tar.bz2 |
Merged revisions 59193-59201 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59195 | facundo.batista | 2007-11-27 19:50:12 +0100 (Tue, 27 Nov 2007) | 4 lines
Moved the errno import from inside the functions to the
module level. Fixes issue 1755179.
........
r59199 | christian.heimes | 2007-11-27 22:28:40 +0100 (Tue, 27 Nov 2007) | 1 line
Backport of changes to PCbuild9 from the py3k branch
........
r59200 | christian.heimes | 2007-11-27 22:34:01 +0100 (Tue, 27 Nov 2007) | 1 line
Replaced import of the 'new' module with 'types' module and added a deprecation warning to the 'new' module.
........
r59201 | christian.heimes | 2007-11-27 22:35:44 +0100 (Tue, 27 Nov 2007) | 1 line
Added a deprecation warning to the 'new' module.
........
Diffstat (limited to 'Lib/test/test_inspect.py')
-rw-r--r-- | Lib/test/test_inspect.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index 3752810..4b78708 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -213,9 +213,9 @@ class TestRetrievingSourceCode(GetSourceBase): self.assertEqual(inspect.getfile(mod.StupidGit), mod.__file__) def test_getmodule_recursion(self): - from new import module + from types import ModuleType name = '__inspect_dummy' - m = sys.modules[name] = module(name) + m = sys.modules[name] = ModuleType(name) m.__file__ = "<string>" # hopefully not a real filename... m.__loader__ = "dummy" # pretend the filename is understood by a loader exec("def x(): pass", m.__dict__) |