diff options
| -rwxr-xr-x | Lib/pydoc.py | 12 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 57071a1..7da75b6 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -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') @@ -429,6 +429,8 @@ Core and Builtins Library ------- +- Issue #7328: pydoc no longer corrupts sys.path when run with the '-m' switch + - Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using TLS or SSL. Patch by Giampaolo Rodola'. |