mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-13 21:38:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 73529 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73529 | r.david.murray | 2009-06-23 14:02:46 -0400 (Tue, 23 Jun 2009) | 4 lines

  Fix issue 5230 by having pydoc's safeimport check to see if the import
  error was thrown from itself in order to decide if the module can't be
  found.  Thanks to Lucas Prado Melo for collaborating on the fix and tests.
........
This commit is contained in:
R. David Murray 2009-06-23 20:37:26 +00:00
parent 5f1446ac5b
commit c4c84e1a19
4 changed files with 52 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/pydoc.py
View file

@ -55,6 +55,7 @@ Richard Chamberlain, for the first implementation of textdoc.
import sys, imp, os, re, types, inspect, __builtin__, pkgutil
from repr import Repr
from string import expandtabs, find, join, lower, split, strip, rfind, rstrip
from traceback import extract_tb
try:
from collections import deque
except ImportError:
@ -299,9 +300,9 @@ def safeimport(path, forceload=0, cache={}):
elif exc is SyntaxError:
# A SyntaxError occurred before we could execute the module.
raise ErrorDuringImport(value.filename, info)
elif exc is ImportError and \
split(lower(str(value)))[:2] == ['no', 'module']:
# The module was not found.
elif exc is ImportError and extract_tb(tb)[-1][2]=='safeimport':
# The import error occurred directly in this function,
# which means there is no such module in the path.
return None
else:
# Some other error occurred during the importing process.