diff options
| author | Thomas Heller <theller@ctypes.org> | 2008-10-30 20:29:54 +0000 |
|---|---|---|
| committer | Thomas Heller <theller@ctypes.org> | 2008-10-30 20:29:54 +0000 |
| commit | 68daeb0f8575bd4acb7c7b0e2d0bfee4c6c961b2 (patch) | |
| tree | 1363426ee10d4044d83bc5669e0ef91aee93cca9 /Lib/modulefinder.py | |
| parent | b74777ed333ce2d22494fd4c996e87d386d950c8 (diff) | |
| download | cpython-git-68daeb0f8575bd4acb7c7b0e2d0bfee4c6c961b2.tar.gz | |
Merged revisions 67046 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67046 | thomas.heller | 2008-10-30 21:18:13 +0100 (Do, 30 Okt 2008) | 2 lines
Fixed a modulefinder crash on certain relative imports.
........
Diffstat (limited to 'Lib/modulefinder.py')
| -rw-r--r-- | Lib/modulefinder.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/modulefinder.py b/Lib/modulefinder.py index ad6a644e1e..7f2bf8b158 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 |