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 |
|---|---|---|
| bdist_wininst | ||
| clinic | ||
| icons | ||
| WinMain.c | -rw-r--r-- | 449 bytes |
| _msi.c | -rw-r--r-- | 31.7 KB |
| _testconsole.c | -rw-r--r-- | 3.3 KB |
| config.c | -rw-r--r-- | 5.2 KB |
| dl_nt.c | -rw-r--r-- | 4.6 KB |
| dllbase_nt.txt | -rw-r--r-- | 3.5 KB |
| empty.c | -rw-r--r-- | 137 bytes |
| errmap.h | -rw-r--r-- | 2.1 KB |
| errmap.mak | -rw-r--r-- | 95 bytes |
| frozen_dllmain.c | -rw-r--r-- | 3.9 KB |
| generrmap.c | -rw-r--r-- | 849 bytes |
| getpathp.c | -rw-r--r-- | 30.0 KB |
| invalid_parameter_handler.c | -rw-r--r-- | 549 bytes |
| launcher.c | -rw-r--r-- | 50.1 KB |
| msvcrtmodule.c | -rw-r--r-- | 14.8 KB |
| pyconfig.h | -rw-r--r-- | 19.3 KB |
| pylauncher.rc | -rw-r--r-- | 1.4 KB |
| pyshellext.cpp | -rw-r--r-- | 18.1 KB |
| pyshellext.def | -rw-r--r-- | 141 bytes |
| pyshellext.idl | -rw-r--r-- | 277 bytes |
| pyshellext.rc | -rw-r--r-- | 1.1 KB |
| pyshellext_d.def | -rw-r--r-- | 143 bytes |
| python.manifest | -rw-r--r-- | 1.3 KB |
| python3.def | -rw-r--r-- | 40.1 KB |
| python3dll.c | -rw-r--r-- | 134 bytes |
| python_exe.rc | -rw-r--r-- | 1.2 KB |
| python_nt.rc | -rw-r--r-- | 1.2 KB |
| python_ver_rc.h | -rw-r--r-- | 970 bytes |
| pythonw_exe.rc | -rw-r--r-- | 1.2 KB |
| readme.txt | -rw-r--r-- | 3.5 KB |
| sqlite3.rc | -rw-r--r-- | 1.3 KB |
| testpy.py | -rw-r--r-- | 831 bytes |
| validate_ucrtbase.py | -rw-r--r-- | 2.7 KB |
| winreg.c | -rw-r--r-- | 59.7 KB |
| winsound.c | -rw-r--r-- | 6.5 KB |
Computing file changes ...
