Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r63746:3aa8d355bd4c
Date: 2013-04-29 09:55 +0200
http://bitbucket.org/pypy/pypy/changeset/3aa8d355bd4c/
Log: Don't crash when hitting ImportError when trying to import a built-
in module. This can occur with 'cppyy'.
diff --git a/lib-python/2.7/pydoc.py b/lib-python/2.7/pydoc.py
--- a/lib-python/2.7/pydoc.py
+++ b/lib-python/2.7/pydoc.py
@@ -1953,7 +1953,11 @@
if key is None:
callback(None, modname, '')
else:
- desc = split(__import__(modname).__doc__ or '', '\n')[0]
+ try:
+ module_doc = __import__(modname).__doc__
+ except ImportError:
+ module_doc = None
+ desc = split(module_doc or '', '\n')[0]
if find(lower(modname + ' - ' + desc), key) >= 0:
callback(None, modname, desc)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
