From 2d0d6c9b82f8749b9f85ea74365dd2601ac3f524 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Mon, 3 Oct 2005 04:50:55 +0000 Subject: Backport: Fix SF bug #976608, Unhelpful error message when mtime of a module is -1 --- Misc/NEWS | 2 ++ Python/import.c | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 97043b3..e29dd95 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,8 @@ What's New in Python 2.4.3c1? 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. Provide a warning when a directory is passed on the command line. diff --git a/Python/import.c b/Python/import.c index 4604714..ee7c593 100644 --- a/Python/import.c +++ b/Python/import.c @@ -867,8 +867,12 @@ load_source_module(char *name, char *pathname, FILE *fp) PyObject *m; 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; + } #if SIZEOF_TIME_T > 4 /* Python's .pyc timestamp handling presumes that the timestamp fits in 4 bytes. This will be fine until sometime in the year 2038, -- cgit v0.12