Skip to content

WIP: bpo-34990: year 2038 problem in compileall.py #9892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
matrixise wants to merge 12 commits into from
Closed

WIP: bpo-34990: year 2038 problem in compileall.py #9892

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f4757a7
bpo-34990: year 2038 problem in compileall.py
matrixise Oct 15, 2018
96dbdab
Add a blurb entry
matrixise Oct 15, 2018
de197d1
Support unsigned long in the tests of compileall.py
matrixise Oct 15, 2018
377f565
Add a test with compileall and the .pyc file with a timestamp >= 2018…
matrixise Oct 15, 2018
b7e89cc
Use unsigned long for the header size
matrixise Oct 17, 2018
eca7980
Use a bitwise 0xFFFF_FFFF on the mtime of the .pyc files
matrixise Oct 17, 2018
2cc344c
Update
matrixise Oct 17, 2018
dc57dde
Fix the mask
matrixise Oct 17, 2018
efdae35
Move test_compile_all_2038 to CompileallTestsBase
matrixise Oct 17, 2018
1f30292
reword the blurb entry
matrixise Oct 17, 2018
4ed1e74
Update importlib_external after the modifications in importlib
matrixise Oct 17, 2018
ca6c049
Revert my modification in Lib/importlib/_bootstrap_external.py: useless,
matrixise Oct 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use unsigned long for the header size
  • Loading branch information
@matrixise
matrixise committed Oct 17, 2018
commit b7e89cc9293fd10049e7bdb8cdb17a7556719384
2 changes: 1 addition & 1 deletion Lib/compileall.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=0,
if not force:
try:
mtime = int(os.stat(fullname).st_mtime)
expect = struct.pack('<4slL', importlib.util.MAGIC_NUMBER,
expect = struct.pack('<4sLL', importlib.util.MAGIC_NUMBER,
0, mtime)
Comment thread
vstinner marked this conversation as resolved.
with open(cfile, 'rb') as chandle:
actual = chandle.read(12)
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_compileall.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def timestamp_metadata(self):
with open(self.bc_path, 'rb') as file:
data = file.read(12)
mtime = int(os.stat(self.source_path).st_mtime)
compare = struct.pack('<4slL', importlib.util.MAGIC_NUMBER, 0, mtime)
compare = struct.pack('<4sLL', importlib.util.MAGIC_NUMBER, 0, mtime)
return data, compare

@unittest.skipUnless(hasattr(os, 'stat'), 'test needs os.stat()')
Expand All @@ -76,7 +76,7 @@ def recreation_check(self, metadata):

def test_mtime(self):
# Test a change in mtime leads to a new .pyc.
self.recreation_check(struct.pack('<4slL', importlib.util.MAGIC_NUMBER,
self.recreation_check(struct.pack('<4sLL', importlib.util.MAGIC_NUMBER,
0, 1))

def test_magic_number(self):
Expand Down