[Python-checkins] r72373 - in python/branches/py3k: Lib/idlelib/NEWS.txt Lib/idlelib/idle.py

Wed May 6 05:38:31 CEST 2009

Author: kurt.kaiser
Date: Wed May 6 05:38:31 2009
New Revision: 72373
Log:
Merged revisions 72226 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r72226 | kurt.kaiser | 2009年05月02日 21:03:44 -0400 (2009年5月02日) | 3 lines
 
 idle.py modified and simplified to better support
 developing experimental versions of IDLE which are
 not installed in the standard location.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/idlelib/NEWS.txt
 python/branches/py3k/Lib/idlelib/idle.py
Modified: python/branches/py3k/Lib/idlelib/NEWS.txt
==============================================================================

--- python/branches/py3k/Lib/idlelib/NEWS.txt	(original)
+++ python/branches/py3k/Lib/idlelib/NEWS.txt	Wed May 6 05:38:31 2009
@@ -30,6 +30,9 @@
 
 *Release date: XX-XXX-2009*
 
+- idle.py modified and simplified to better support developing experimental
+ versions of IDLE which are not installed in the standard location.
+
 - OutputWindow/PyShell right click menu "Go to file/line" wasn't working with
 file paths containing spaces. Bug 5559.
 
Modified: python/branches/py3k/Lib/idlelib/idle.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/idle.py	(original)
+++ python/branches/py3k/Lib/idlelib/idle.py	Wed May 6 05:38:31 2009
@@ -1,22 +1,11 @@
-try:
- import idlelib, idlelib.PyShell
-except ImportError:
- # IDLE is not installed, but maybe PyShell is on sys.path:
- print("*** idle.py import error! Trying alternate approach....")
- try:
- import PyShell
- except ImportError:
- raise
- else:
- import os
- idledir = os.path.dirname(os.path.abspath(PyShell.__file__))
- if idledir != os.getcwd():
- # We're not in the IDLE directory, help the subprocess find run.py
- pypath = os.environ.get('PYTHONPATH', '')
- if pypath:
- os.environ['PYTHONPATH'] = pypath + ':' + idledir
- else:
- os.environ['PYTHONPATH'] = idledir
- PyShell.main()
-else:
- idlelib.PyShell.main()
+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:
+idlelib_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+sys.path.insert(0, idlelib_dir)
+
+import idlelib.PyShell
+idlelib.PyShell.main()
