From: Brett Cannon <bcannon@gmail.com>
Date: Mon, 20 Jul 2009 00:19:49 +0000 (+0000)
Subject: Backport of r74103.
X-Git-Tag: v3.1.1rc1~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10e35b30fb6e5858b73039e96d6ac3450107dad3;p=thirdparty%2FPython%2Fcpython.git

Backport of r74103.
---

diff --git a/Lib/importlib/test/source/test_abc_loader.py b/Lib/importlib/test/source/test_abc_loader.py
index b95db04fd947..9acc4ad3a0d9 100644
--- a/Lib/importlib/test/source/test_abc_loader.py
+++ b/Lib/importlib/test/source/test_abc_loader.py
@@ -346,20 +346,20 @@ class BadBytecodeFailureTests(unittest.TestCase):
         # 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 286c9249c94d..6aed9597d2bb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -62,6 +62,12 @@ Build
 - 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?
 =========================