Staging
v0.5.1
https://github.com/python/cpython
Revision 75345c552d0889f4f63039d6063f371846c8f41f authored by Nick Coghlan on 12 March 2017, 11:34:22 UTC, committed by Ned Deily on 21 March 2017, 05:55:11 UTC
Directory and zipfile execution previously added
the parent directory of the directory or zipfile
as sys.path[0] and then subsequently overwrote
it with the directory or zipfile itself.

This caused problems in isolated mode, as it
overwrote the "stdlib as a zip archive" entry
in sys.path, as the parent directory was
never added.

The attempted fix to that issue in bpo-29319
created the opposite problem in *non*-isolated
mode, by potentially leaving the parent
directory on sys.path instead of overwriting it.

This change fixes the root cause of the problem
by removing the whole "add-and-overwrite" dance
for sys.path[0], and instead simply never adds
the parent directory to sys.path in the first
place.
(cherry picked from commit d2977a3ae2cc6802921b1e3b6e9d13fcfbda872d)

(cherry picked from commit c60948464fb0ec116ea227f6bce8a4bb8fb75257)
1 parent 07e6cbd
Raw File
Tip revision: 75345c552d0889f4f63039d6063f371846c8f41f authored by Nick Coghlan on 12 March 2017, 11:34:22 UTC
[3.6] bpo-29723: Consistently configure sys.path[0] (#636)
Tip revision: 75345c5
.hgeol
[patterns]

# Non human-editable files are binary

**.dsp  = BIN
**.dsw  = BIN
**.mk   = BIN
**.sln  = BIN
**.vcproj  = BIN
**.vsprops = BIN

**.aif  = BIN
**.aifc = BIN
**.aiff = BIN
**.au   = BIN
**.bmp  = BIN
**.db   = BIN
**.exe  = BIN
**.icns = BIN
**.gif  = BIN
**.ico  = BIN
**.info = BIN
**.jpg  = BIN
**.pck  = BIN
**.png  = BIN
**.psd  = BIN
**.tar  = BIN
**.wav  = BIN
**.whl  = BIN
**.xar  = BIN
**.zip  = BIN

Lib/test/cjkencodings/* = BIN
Lib/test/decimaltestdata/*.decTest = BIN
Lib/test/sndhdrdata/sndhdr.* = BIN
Lib/test/test_email/data/msg_26.txt = BIN
Lib/test/xmltestdata/* = BIN

Lib/venv/scripts/nt/* = BIN

Lib/test/coding20731.py = BIN

# Windows only zlib upstream file
Modules/zlib/zlib.map = CRLF

# Windows batch files work best with CRLF, there can be subtle problems with LF
**.bat = CRLF

# The Windows readme is likely to be read in Notepad, so make it readable
PCbuild/readme.txt = CRLF

# All other files (which presumably are human-editable) are "native".
# This must be the last rule!

** = native

[repository]
native = LF
back to top