Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Port import fixes from 2.7.

Browse source
This commit is contained in:
Antoine Pitrou 2012-01-25 18:06:07 +01:00
commit 581616624d
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/importlib/test/source/test_file_loader.py
View file

@ -133,7 +133,7 @@ def test_timestamp_overflow(self):
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:

2
Lib/test/test_import.py
View file

@ -317,7 +317,7 @@ def test_timestamp_overflow(self):
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:

20
Python/import.c
View file

@ -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);