Backport of r74103.
diff --git a/Lib/importlib/test/source/test_abc_loader.py b/Lib/importlib/test/source/test_abc_loader.py
index b95db04..9acc4ad 100644
--- a/Lib/importlib/test/source/test_abc_loader.py
+++ b/Lib/importlib/test/source/test_abc_loader.py
@@ -346,20 +346,20 @@
# A bad magic number should lead to an ImportError.
name = 'mod'
bad_magic = b'\x00\x00\x00\x00'
- mock = PyPycLoaderMock({}, {name: {'path': os.path.join('path', 'to',
- 'mod'),
- 'magic': bad_magic}})
+ mock = PyPycLoaderMock({name: None},
+ {name: {'path': os.path.join('path', 'to', 'mod'),
+ 'magic': bad_magic}})
with util.uncache(name):
self.assertRaises(ImportError, mock.load_module, name)
def test_bad_bytecode(self):
- # Bad code object bytecode should elad to an ImportError.
+ # Bad code object bytecode should lead to an ImportError.
name = 'mod'
- mock = PyPycLoaderMock({}, {name: {'path': os.path.join('path', 'to',
- 'mod'),
- 'bc': b''}})
+ mock = PyPycLoaderMock({name: None},
+ {name: {'path': os.path.join('path', 'to', 'mod'),
+ 'bc': b''}})
with util.uncache(name):
- self.assertRaises(ImportError, mock.load_module, name)
+ self.assertRaises(EOFError, mock.load_module, name)
def raise_ImportError(*args, **kwargs):
diff --git a/Misc/NEWS b/Misc/NEWS
index 286c924..6aed959 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -62,6 +62,12 @@
- Issue 5390: Add uninstall icon independent of whether file
extensions are installed.
+Test
+----
+
+- Fix a test in importlib.test.source.test_abc_loader that was incorrectly
+ testing when a .pyc file lacked an code object bytecode.
+
What's New in Python 3.1?
=========================