mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix SF bug #976608, Unhelpful error message when mtime of a module is -1

Browse source 
Will backport.
This commit is contained in:
Neal Norwitz 2005-10-03 04:48:15 +00:00
parent a45770d6d0
commit 708e51a6b1
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -12,6 +12,8 @@ What's New in Python 2.5 alpha 1?
Core and builtins Core and builtins
----------------- -----------------
- SF Bug #976608: fix SystemError when mtime of an imported file is -1.
- SF Bug #887946: fix segfault when redirecting stdin from a directory. - SF Bug #887946: fix segfault when redirecting stdin from a directory.
Provide a warning when a directory is passed on the command line. Provide a warning when a directory is passed on the command line.

6
Python/import.c
View file

@ -868,8 +868,12 @@ load_source_module(char *name, char *pathname, FILE *fp)
PyObject *m; PyObject *m;
mtime = PyOS_GetLastModificationTime(pathname, fp); mtime = PyOS_GetLastModificationTime(pathname, fp);
if (mtime == (time_t)(-1)) if (mtime == (time_t)(-1)) {
PyErr_Format(PyExc_RuntimeError,
"unable to get modification time from '%s'",
pathname);
return NULL; return NULL;
}
#if SIZEOF_TIME_T > 4 #if SIZEOF_TIME_T > 4
/* Python's .pyc timestamp handling presumes that the timestamp fits /* Python's .pyc timestamp handling presumes that the timestamp fits
in 4 bytes. This will be fine until sometime in the year 2038, in 4 bytes. This will be fine until sometime in the year 2038,