diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2016-09-30 06:56:46 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2016-09-30 06:56:46 (GMT) |
| commit | b63c4fc18bb144037d2d3317612d340860788ed6 (patch) | |
| tree | 3b20ddb85d1a3ddbaf401ba0db15681570f4a4d2 /Lib/idlelib/idle.py | |
| parent | c6b5f08f04c7986cd48cec6d32a5d2983862255a (diff) | |
| parent | 1813aa1a0c456d36efce87cfacf47eb89b6958e6 (diff) | |
| download | cpython-b63c4fc18bb144037d2d3317612d340860788ed6.zip cpython-b63c4fc18bb144037d2d3317612d340860788ed6.tar.gz cpython-b63c4fc18bb144037d2d3317612d340860788ed6.tar.bz2 | |
Issue #25488: merge idle.py from 3.5.
Diffstat (limited to 'Lib/idlelib/idle.py')
| -rw-r--r-- | Lib/idlelib/idle.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Lib/idlelib/idle.py b/Lib/idlelib/idle.py index c01cf99..485d5a7 100644 --- a/Lib/idlelib/idle.py +++ b/Lib/idlelib/idle.py @@ -1,11 +1,14 @@ 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() |