mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-15 21:26:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #7328: don't corrupt sys.path when running pydoc with the -m switch

Browse source
This commit is contained in:
Nick Coghlan 2009-11-15 22:36:47 +00:00
parent ccd5e02d2b
commit 11db64e5fd
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/pydoc.py
View file

@ -2254,11 +2254,13 @@ def cli():
import getopt
class BadUsage: pass
# Scripts don't get the current directory in their path by default.
scriptdir = os.path.dirname(sys.argv[0])
if scriptdir in sys.path:
sys.path.remove(scriptdir)
sys.path.insert(0, '.')
# Scripts don't get the current directory in their path by default
# unless they are run with the '-m' switch
if '' not in sys.path:
scriptdir = os.path.dirname(sys.argv[0])
if scriptdir in sys.path:
sys.path.remove(scriptdir)
sys.path.insert(0, '.')
try:
opts, args = getopt.getopt(sys.argv[1:], 'gk:p:w')