summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
Diffstat (limited to 'Python')
-rw-r--r--Python/import.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/Python/import.c b/Python/import.c
index 6c1050f..4090118 100644
--- 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,