Merge heads

This commit is contained in:
Serhiy Storchaka 2016-09-30 10:39:12 +03:00
commit bf39849e56
1 changed files with 10 additions and 7 deletions

View File

@ -1,11 +1,14 @@
import os.path import os.path
import sys 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:
idlelib_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
sys.path.insert(0, idlelib_dir)
import idlelib.pyshell # Enable running IDLE with idlelib in a non-standard location.
idlelib.pyshell.main() # 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__)))
if idlelib_dir not in sys.path:
sys.path.insert(0, idlelib_dir)
from idlelib.pyshell import main # This is subject to change
main()