]> granicus.if.org Git - python/commit
[3.6] bpo-29723: Consistently configure sys.path[0] (#636)
authorNick Coghlan <ncoghlan@gmail.com>
Sun, 12 Mar 2017 11:34:22 +0000 (21:34 +1000)
committerNed Deily <nad@python.org>
Tue, 21 Mar 2017 05:55:11 +0000 (01:55 -0400)
commit75345c552d0889f4f63039d6063f371846c8f41f
tree73b5a5e4ea5c7e2b447cadf15f77f0a53d053dc1
parent07e6cbd7b9e5b6047a608cedd5cc9b20891a3972
[3.6] bpo-29723: Consistently configure sys.path[0] (#636)

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)
Lib/test/test_cmd_line_script.py
Misc/NEWS
Modules/main.c