[Python-checkins] cpython (merge default -> default): Merge heads

[serhiy.storchaka]

https://hg.python.org/cpython/rev/d6d914ed0d7e
changeset:   104181:d6d914ed0d7e
parent:      104177:44af6bd21b94
parent:      104174:f17341773c76
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Fri Sep 30 10:39:12 2016 +0300
summary:
  Merge heads

files:
  Lib/idlelib/idle.py |  15 +++++++++------
  1 files changed, 9 insertions(+), 6 deletions(-)


diff --git a/Lib/idlelib/idle.py b/Lib/idlelib/idle.py
--- 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()

-- 
Repository URL: https://hg.python.org/cpython