Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 05:31:20 +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:01:45 +01:00
parent dd21f68963
commit 33d15f7c85
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

@ -138,7 +138,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

@ -321,7 +321,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

@ -1226,9 +1226,9 @@ write_compiled_module(PyCodeObject *co, char *cpathname, struct stat *srcstat)
(void) unlink(cpathname);
return;
}
/* Now write the true mtime */
/* Now write the true mtime (as a 32-bit field) */
fseek(fp, 4L, 0);
assert(mtime < LONG_MAX);
assert(mtime <= 0xFFFFFFFF);
PyMarshal_WriteLongToFile((long)mtime, fp, Py_MARSHAL_VERSION);
fflush(fp);
fclose(fp);
@ -1302,14 +1302,14 @@ load_source_module(char *name, char *pathname, FILE *fp)
pathname);
return NULL;
}
#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;
}
cpathname = make_compiled_pathname(
pathname, buf, (size_t)MAXPATHLEN + 1, !Py_OptimizeFlag);
if (cpathname != NULL &&