[Python-checkins] r72226 - in python/trunk/Lib/idlelib: NEWS.txt idle.py
kurt.kaiser
python-checkins at python.org
Sun May 3 03:03:45 CEST 2009
Author: kurt.kaiser
Date: Sun May 3 03:03:44 2009
New Revision: 72226
Log:
idle.py modified and simplified to better support
developing experimental versions of IDLE which are
not installed in the standard location.
Modified:
python/trunk/Lib/idlelib/NEWS.txt
python/trunk/Lib/idlelib/idle.py
Modified: python/trunk/Lib/idlelib/NEWS.txt
==============================================================================
--- python/trunk/Lib/idlelib/NEWS.txt (original)
+++ python/trunk/Lib/idlelib/NEWS.txt Sun May 3 03:03:44 2009
@@ -3,6 +3,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/trunk/Lib/idlelib/idle.py
==============================================================================
--- python/trunk/Lib/idlelib/idle.py (original)
+++ python/trunk/Lib/idlelib/idle.py Sun May 3 03:03:44 2009
@@ -1,21 +1,11 @@
-try:
- import idlelib.PyShell
-except ImportError:
- # IDLE is not installed, but maybe PyShell is on sys.path:
- 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()
More information about the Python-checkins
mailing list