Fix a curious bug: statements like "import sys.time" would succeed,

because the path through the code would notice that sys.__path__ did
not exist and it would fall back to the default path (builtins +
sys.path) instead of failing).  No longer.

diff --git a/Python/import.c b/Python/import.c
index 6c1050f0c696581cffd745251bd4f299f61259d8..40901180bf9ae03afc734362efab17a9992c897b 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -1664,9 +1664,16 @@ import_submodule(mod, subname, fullname)
                struct filedescr *fdp;
                FILE *fp = NULL;
 
-               path = PyObject_GetAttrString(mod, "__path__");
-               if (path == NULL)
-                       PyErr_Clear();
+               if (mod == Py_None)
+                       path = NULL;
+               else {
+                       path = PyObject_GetAttrString(mod, "__path__");
+                       if (path == NULL) {
+                               PyErr_Clear();
+                               Py_INCREF(Py_None);
+                               return Py_None;
+                       }
+               }
 
                buf[0] = '\0';
                fdp = find_module(subname, path,