mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-06 01:49:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Recorded merge of revisions 76314 via svnmerge from

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

................
  r76314 | nick.coghlan | 2009-11-16 09:04:33 +1000 (Mon, 16 Nov 2009) | 9 lines

  Merged revisions 76312 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76312 | nick.coghlan | 2009-11-16 08:36:47 +1000 (Mon, 16 Nov 2009) | 1 line

    Issue #7328: don't corrupt sys.path when running pydoc with the -m switch
  ........
................
This commit is contained in:
Nick Coghlan 2009-11-15 23:27:31 +00:00
parent f5b3a1498c
commit b830a230c1
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

@ -2249,11 +2249,13 @@ def cli():
import getopt
class BadUsage(Exception): 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')