summaryrefslogtreecommitdiffstats
path: root/Lib/modulefinder.py
diff options
context:
space:
mode:
authorThomas Heller <theller@ctypes.org>2008-10-30 20:18:13 (GMT)
committerThomas Heller <theller@ctypes.org>2008-10-30 20:18:13 (GMT)
commit1fac5a450562c50a3b7121598da7f010a306e50f (patch)
tree9bbe61db122422c7c67c1e1b1f7f5ae3d587ce18 /Lib/modulefinder.py
parent9f616f48caaa2c5ef8a1a1a317b41c1d53e06198 (diff)
downloadcpython-1fac5a450562c50a3b7121598da7f010a306e50f.zip
cpython-1fac5a450562c50a3b7121598da7f010a306e50f.tar.gz
cpython-1fac5a450562c50a3b7121598da7f010a306e50f.tar.bz2
Fixed a modulefinder crash on certain relative imports.
Diffstat (limited to 'Lib/modulefinder.py')
-rw-r--r--Lib/modulefinder.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py
index ad6a644..7f2bf8b 100644
--- a/Lib/modulefinder.py
+++ b/Lib/modulefinder.py
@@ -309,7 +309,10 @@ class ModuleFinder:
def _add_badmodule(self, name, caller):
if name not in self.badmodules:
self.badmodules[name] = {}
- self.badmodules[name][caller.__name__] = 1
+ if caller:
+ self.badmodules[name][caller.__name__] = 1
+ else:
+ self.badmodules[name]["-"] = 1
def _safe_import_hook(self, name, caller, fromlist, level=-1):
# wrapper for self.import_hook() that won't raise ImportError