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
History
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
File Mode Size
.github
Doc
Grammar
Include
Lib
Mac
Misc
Modules
Objects
PC
PCbuild
Parser
Programs
Python
Tools
.bzrignore -rw-r--r-- 582 bytes
.codecov.yml -rw-r--r-- 545 bytes
.gitattributes -rw-r--r-- 280 bytes
.gitignore -rw-r--r-- 1.3 KB
.hgeol -rw-r--r-- 1.0 KB
.hgignore -rw-r--r-- 1.3 KB
.hgtags -rw-r--r-- 8.7 KB
.hgtouch -rw-r--r-- 1.3 KB
.mention-bot -rw-r--r-- 39 bytes
.travis.yml -rw-r--r-- 3.6 KB
LICENSE -rw-r--r-- 12.5 KB
Makefile.pre.in -rw-r--r-- 57.6 KB
README.rst -rw-r--r-- 8.9 KB
aclocal.m4 -rw-r--r-- 10.7 KB
config.guess -rwxr-xr-x 41.9 KB
config.sub -rwxr-xr-x 34.9 KB
configure -rwxr-xr-x 472.2 KB
configure.ac -rw-r--r-- 156.0 KB
install-sh -rwxr-xr-x 7.0 KB
pyconfig.h.in -rw-r--r-- 40.4 KB
setup.py -rw-r--r-- 98.8 KB

README.rst

back to top