diff options
| -rw-r--r-- | Lib/importlib/test/source/test_file_loader.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_import.py | 2 | ||||
| -rw-r--r-- | Python/import.c | 20 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Lib/importlib/test/source/test_file_loader.py b/Lib/importlib/test/source/test_file_loader.py index 2ca57d0..21e718f 100644 --- a/Lib/importlib/test/source/test_file_loader.py +++ b/Lib/importlib/test/source/test_file_loader.py @@ -133,7 +133,7 @@ class SimpleTest(unittest.TestCase): with open(source, 'w') as f: f.write("x = 5") try: - os.utime(source, (2 ** 33, 2 ** 33)) + os.utime(source, (2 ** 33 - 5, 2 ** 33 - 5)) except OverflowError: self.skipTest("cannot set modification time to large integer") except OSError as e: diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py index d121ba3..62fdf4b 100644 --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -317,7 +317,7 @@ class ImportTests(unittest.TestCase): with open(source, 'w') as f: pass try: - os.utime(source, (2 ** 33, 2 ** 33)) + os.utime(source, (2 ** 33 - 5, 2 ** 33 - 5)) except OverflowError: self.skipTest("cannot set modification time to large integer") except OSError as e: diff --git a/Python/import.c b/Python/import.c index 487347c..d5b89d5 100644 --- a/Python/import.c +++ b/Python/import.c @@ -1343,9 +1343,9 @@ write_compiled_module(PyCodeObject *co, PyObject *cpathname, PyMarshal_WriteLongToFile(0L, fp, Py_MARSHAL_VERSION); PyMarshal_WriteObjectToFile((PyObject *)co, fp, Py_MARSHAL_VERSION); fflush(fp); - /* Now write the true mtime and size */ + /* Now write the true mtime and size (as 32-bit fields) */ fseek(fp, 4L, 0); - assert(mtime < LONG_MAX); + assert(mtime <= 0xFFFFFFFF); PyMarshal_WriteLongToFile((long)mtime, fp, Py_MARSHAL_VERSION); PyMarshal_WriteLongToFile(size, fp, Py_MARSHAL_VERSION); if (fflush(fp) != 0 || ferror(fp)) { @@ -1476,14 +1476,14 @@ load_source_module(PyObject *name, PyObject *pathname, FILE *fp) pathname); goto error; } -#if SIZEOF_TIME_T > 4 - /* Python's .pyc timestamp handling presumes that the timestamp fits - in 4 bytes. Since the code only does an equality comparison, - ordering is not important and we can safely ignore the higher bits - (collisions are extremely unlikely). - */ - st.st_mtime &= 0xFFFFFFFF; -#endif + if (sizeof st.st_mtime > 4) { + /* Python's .pyc timestamp handling presumes that the timestamp fits + in 4 bytes. Since the code only does an equality comparison, + ordering is not important and we can safely ignore the higher bits + (collisions are extremely unlikely). + */ + st.st_mtime &= 0xFFFFFFFF; + } if (PyUnicode_READY(pathname) < 0) return NULL; cpathname = make_compiled_pathname(pathname, !Py_OptimizeFlag); |