diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2016-09-30 07:38:31 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-09-30 07:38:31 (GMT) |
commit | 07cfd504e43c5078b8d106395c45b0a3f6c22fa3 (patch) | |
tree | b601e766eab9fb9f41d102ddf96b73837e46b5f3 /Lib | |
parent | 00a0fc1144d928515ff8abd0de7bb6ad072fcbdb (diff) | |
parent | 1813aa1a0c456d36efce87cfacf47eb89b6958e6 (diff) | |
download | cpython-07cfd504e43c5078b8d106395c45b0a3f6c22fa3.zip cpython-07cfd504e43c5078b8d106395c45b0a3f6c22fa3.tar.gz cpython-07cfd504e43c5078b8d106395c45b0a3f6c22fa3.tar.bz2 |
Merge heads
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/idlelib/idle.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Lib/idlelib/idle.py b/Lib/idlelib/idle.py index a249557..141534d 100644 --- a/Lib/idlelib/idle.py +++ b/Lib/idlelib/idle.py @@ -1,11 +1,13 @@ import os.path import sys -# If we are working on a development version of IDLE, we need to prepend the -# parent of this idlelib dir to sys.path. Otherwise, importing idlelib gets -# the version installed with the Python used to call this module: +# Enable running IDLE with idlelib in a non-standard location. +# This was once used to run development versions of IDLE. +# Because PEP 434 declared idle.py a public interface, +# removal should require deprecation. idlelib_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -sys.path.insert(0, idlelib_dir) +if idlelib_dir not in sys.path: + sys.path.insert(0, idlelib_dir) -import idlelib.PyShell -idlelib.PyShell.main() +from idlelib.PyShell import main # This is subject to change +main() |