Staging
v0.8.1
https://github.com/python/cpython
Revision 891c91d8d38848377a9f475242507510873eb9c3 authored by Nick Coghlan on 23 January 2018, 10:48:11 UTC, committed by larryhastings on 23 January 2018, 10:48: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)
1 parent 57fa0ab
History
Tip revision: 891c91d8d38848377a9f475242507510873eb9c3 authored by Nick Coghlan on 23 January 2018, 10:48:11 UTC
[3.5] bpo-32551: Consistently configure sys.path[0] (#5197)
Tip revision: 891c91d
File Mode Size
Python.asdl -rw-r--r-- 4.6 KB
acceler.c -rw-r--r-- 3.3 KB
asdl.py -rw-r--r-- 12.6 KB
asdl_c.py -rwxr-xr-x 43.4 KB
bitset.c -rw-r--r-- 1.0 KB
firstsets.c -rw-r--r-- 2.8 KB
grammar.c -rw-r--r-- 6.8 KB
grammar1.c -rw-r--r-- 1.3 KB
listnode.c -rw-r--r-- 1.2 KB
metagrammar.c -rw-r--r-- 2.4 KB
myreadline.c -rw-r--r-- 6.1 KB
node.c -rw-r--r-- 4.4 KB
parser.c -rw-r--r-- 11.6 KB
parser.h -rw-r--r-- 1.0 KB
parsetok.c -rw-r--r-- 10.5 KB
parsetok_pgen.c -rw-r--r-- 35 bytes
pgen.c -rw-r--r-- 17.5 KB
pgenmain.c -rw-r--r-- 3.8 KB
printgrammar.c -rw-r--r-- 2.9 KB
tokenizer.c -rw-r--r-- 52.0 KB
tokenizer.h -rw-r--r-- 3.8 KB
tokenizer_pgen.c -rw-r--r-- 36 bytes

back to top