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
ACKS -rw-r--r-- 24.6 KB
HISTORY -rw-r--r-- 1.3 MB
NEWS -rw-r--r-- 319.3 KB
Porting -rw-r--r-- 107 bytes
README -rw-r--r-- 1.4 KB
README.AIX -rw-r--r-- 5.0 KB
README.coverity -rw-r--r-- 845 bytes
README.valgrind -rw-r--r-- 4.5 KB
SpecialBuilds.txt -rw-r--r-- 10.0 KB
coverity_model.c -rw-r--r-- 4.1 KB
gdbinit -rw-r--r-- 4.7 KB
indent.pro -rw-r--r-- 557 bytes
python-config.in -rw-r--r-- 2.0 KB
python-config.sh.in -rw-r--r-- 2.9 KB
python-wing3.wpr -rw-r--r-- 555 bytes
python-wing4.wpr -rw-r--r-- 835 bytes
python-wing5.wpr -rw-r--r-- 835 bytes
python.man -rw-r--r-- 13.2 KB
python.pc.in -rw-r--r-- 293 bytes
svnmap.txt -rw-r--r-- 4.1 MB
valgrind-python.supp -rw-r--r-- 8.2 KB
vgrindefs -rw-r--r-- 500 bytes

README

back to top