|
 |
ebb58f9 |
|
|
|
ebb58f9 |
# HG changeset patch
|
|
|
ebb58f9 |
# User Brett Cannon <brett@python.org>
|
|
|
ebb58f9 |
# Date 1393602285 18000
|
|
|
ebb58f9 |
# Node ID 432cb56db05d73f55d211501bf0dfc767768923b
|
|
|
ebb58f9 |
# Parent ade5e4922a54cb84c99ec924ab7c700a014893da
|
|
|
ebb58f9 |
Issue #20778: Fix modulefinder to work with bytecode-only modules.
|
|
|
ebb58f9 |
|
|
|
ebb58f9 |
Bug filed and initial attempt at a patch by Bohuslav Kabrda.
|
|
|
ebb58f9 |
|
|
|
ebb58f9 |
diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py
|
|
|
ebb58f9 |
--- a/Lib/modulefinder.py
|
|
|
ebb58f9 |
+++ b/Lib/modulefinder.py
|
|
|
ebb58f9 |
@@ -287,7 +287,7 @@ class ModuleFinder:
|
|
|
ebb58f9 |
if fp.read(4) != imp.get_magic():
|
|
|
ebb58f9 |
self.msgout(2, "raise ImportError: Bad magic number", pathname)
|
|
|
ebb58f9 |
raise ImportError("Bad magic number in %s" % pathname)
|
|
|
ebb58f9 |
- fp.read(4)
|
|
|
ebb58f9 |
+ fp.read(8) # Skip mtime and size.
|
|
|
ebb58f9 |
co = marshal.load(fp)
|
|
|
ebb58f9 |
else:
|
|
|
ebb58f9 |
co = None
|
|
|
ebb58f9 |
diff --git a/Lib/test/test_modulefinder.py b/Lib/test/test_modulefinder.py
|
|
|
ebb58f9 |
--- a/Lib/test/test_modulefinder.py
|
|
|
ebb58f9 |
+++ b/Lib/test/test_modulefinder.py
|
|
|
ebb58f9 |
@@ -1,5 +1,7 @@
|
|
|
ebb58f9 |
import os
|
|
|
ebb58f9 |
import errno
|
|
|
ebb58f9 |
+import importlib.machinery
|
|
|
ebb58f9 |
+import py_compile
|
|
|
ebb58f9 |
import shutil
|
|
|
ebb58f9 |
import unittest
|
|
|
ebb58f9 |
import tempfile
|
|
|
ebb58f9 |
@@ -208,6 +210,14 @@ a/module.py
|
|
|
ebb58f9 |
from . import *
|
|
|
ebb58f9 |
"""]
|
|
|
ebb58f9 |
|
|
|
ebb58f9 |
+bytecode_test = [
|
|
|
ebb58f9 |
+ "a",
|
|
|
ebb58f9 |
+ ["a"],
|
|
|
ebb58f9 |
+ [],
|
|
|
ebb58f9 |
+ [],
|
|
|
ebb58f9 |
+ ""
|
|
|
ebb58f9 |
+]
|
|
|
ebb58f9 |
+
|
|
|
ebb58f9 |
|
|
|
ebb58f9 |
def open_file(path):
|
|
|
ebb58f9 |
dirname = os.path.dirname(path)
|
|
|
ebb58f9 |
@@ -288,6 +298,16 @@ class ModuleFinderTest(unittest.TestCase
|
|
|
ebb58f9 |
def test_relative_imports_4(self):
|
|
|
ebb58f9 |
self._do_test(relative_import_test_4)
|
|
|
ebb58f9 |
|
|
|
ebb58f9 |
+ def test_bytecode(self):
|
|
|
ebb58f9 |
+ base_path = os.path.join(TEST_DIR, 'a')
|
|
|
ebb58f9 |
+ source_path = base_path + importlib.machinery.SOURCE_SUFFIXES[0]
|
|
|
ebb58f9 |
+ bytecode_path = base_path + importlib.machinery.BYTECODE_SUFFIXES[0]
|
|
|
ebb58f9 |
+ with open_file(source_path) as file:
|
|
|
ebb58f9 |
+ file.write('testing_modulefinder = True\n')
|
|
|
ebb58f9 |
+ py_compile.compile(source_path, cfile=bytecode_path)
|
|
|
ebb58f9 |
+ os.remove(source_path)
|
|
|
ebb58f9 |
+ self._do_test(bytecode_test)
|
|
|
ebb58f9 |
+
|
|
|
ebb58f9 |
|
|
|
ebb58f9 |
def test_main():
|
|
|
ebb58f9 |
support.run_unittest(ModuleFinderTest)
|