Staging
v0.5.1
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
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)
[3.6] bpo-29723: Consistently configure sys.path[0] (#636)
Tip revision: 75345c5
| File | Mode | Size |
|---|---|---|
| Python.asdl | -rw-r--r-- | 5.0 KB |
| acceler.c | -rw-r--r-- | 3.3 KB |
| asdl.py | -rw-r--r-- | 12.6 KB |
| asdl_c.py | -rw-r--r-- | 43.6 KB |
| bitset.c | -rw-r--r-- | 1.0 KB |
| firstsets.c | -rw-r--r-- | 2.8 KB |
| grammar.c | -rw-r--r-- | 7.4 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-- | 9.9 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.6 KB |
| parsetok_pgen.c | -rw-r--r-- | 35 bytes |
| pgen.c | -rw-r--r-- | 17.9 KB |
| pgenmain.c | -rw-r--r-- | 4.0 KB |
| printgrammar.c | -rw-r--r-- | 2.9 KB |
| tokenizer.c | -rw-r--r-- | 54.3 KB |
| tokenizer.h | -rw-r--r-- | 3.8 KB |
| tokenizer_pgen.c | -rw-r--r-- | 36 bytes |
Computing file changes ...
