mirror of
https://github.com/python/cpython.git
synced 2025-10-17 20:28:43 +00:00
Issue #13645: pyc files now contain the size of the corresponding source
code, to avoid timestamp collisions (especially on filesystems with a low timestamp resolution) when checking for freshness of the bytecode.
This commit is contained in:
parent
1f918c1480
commit
5136ac0ca2
14 changed files with 167 additions and 49 deletions
|
@ -19,7 +19,7 @@ import io
|
|||
from traceback import extract_tb, extract_stack, print_tb
|
||||
raise_src = 'def do_raise(): raise TypeError\n'
|
||||
|
||||
def make_pyc(co, mtime):
|
||||
def make_pyc(co, mtime, size):
|
||||
data = marshal.dumps(co)
|
||||
if type(mtime) is type(0.0):
|
||||
# Mac mtimes need a bit of special casing
|
||||
|
@ -27,14 +27,14 @@ def make_pyc(co, mtime):
|
|||
mtime = int(mtime)
|
||||
else:
|
||||
mtime = int(-0x100000000 + int(mtime))
|
||||
pyc = imp.get_magic() + struct.pack("<i", int(mtime)) + data
|
||||
pyc = imp.get_magic() + struct.pack("<ii", int(mtime), size & 0xFFFFFFFF) + data
|
||||
return pyc
|
||||
|
||||
def module_path_to_dotted_name(path):
|
||||
return path.replace(os.sep, '.')
|
||||
|
||||
NOW = time.time()
|
||||
test_pyc = make_pyc(test_co, NOW)
|
||||
test_pyc = make_pyc(test_co, NOW, len(test_src))
|
||||
|
||||
|
||||
TESTMOD = "ziptestmodule"
|
||||
|
@ -293,7 +293,7 @@ class UncompressedZipImportTestCase(ImportHooksBaseTestCase):
|
|||
return __file__
|
||||
if __loader__.get_data("some.data") != b"some data":
|
||||
raise AssertionError("bad data")\n"""
|
||||
pyc = make_pyc(compile(src, "<???>", "exec"), NOW)
|
||||
pyc = make_pyc(compile(src, "<???>", "exec"), NOW, len(src))
|
||||
files = {TESTMOD + pyc_ext: (NOW, pyc),
|
||||
"some.data": (NOW, "some data")}
|
||||
self.doTest(pyc_ext, files, TESTMOD)
|
||||
|
@ -313,7 +313,7 @@ class UncompressedZipImportTestCase(ImportHooksBaseTestCase):
|
|||
self.doTest(".py", files, TESTMOD, call=self.assertModuleSource)
|
||||
|
||||
def testGetCompiledSource(self):
|
||||
pyc = make_pyc(compile(test_src, "<???>", "exec"), NOW)
|
||||
pyc = make_pyc(compile(test_src, "<???>", "exec"), NOW, len(test_src))
|
||||
files = {TESTMOD + ".py": (NOW, test_src),
|
||||
TESTMOD + pyc_ext: (NOW, pyc)}
|
||||
self.doTest(pyc_ext, files, TESTMOD, call=self.assertModuleSource)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue