summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2001-05-12 12:18:10 (GMT)
committerGuido van Rossum <guido@python.org>2001-05-12 12:18:10 (GMT)
commit6cb7a21934d2579152b9dedc8b4c87e7c8b3faaa (patch)
treebdd72506a8131217068a741aa7c95ef25b85fc4d
parent8451ebb435e3b959a036187e6aa8b18a84b42a2b (diff)
downloadcpython-6cb7a21934d2579152b9dedc8b4c87e7c8b3faaa.zip
cpython-6cb7a21934d2579152b9dedc8b4c87e7c8b3faaa.tar.gz
cpython-6cb7a21934d2579152b9dedc8b4c87e7c8b3faaa.tar.bz2
Move the action of loading the configuration to the IdleConf module
rather than the idle.py script. This has advantages and disadvantages; the biggest advantage being that we can more easily have an alternative main program.
-rw-r--r--Tools/idle/IdleConf.py1
-rwxr-xr-xTools/idle/idle.py8
2 files changed, 1 insertions, 8 deletions
diff --git a/Tools/idle/IdleConf.py b/Tools/idle/IdleConf.py
index 37f4ef1..8eaa8e0 100644
--- a/Tools/idle/IdleConf.py
+++ b/Tools/idle/IdleConf.py
@@ -110,3 +110,4 @@ def load(dir):
os.path.join(homedir, ".idle")))
idleconf = IdleConfParser()
+load(os.path.dirname(__file__))
diff --git a/Tools/idle/idle.py b/Tools/idle/idle.py
index f42327c..8638a16 100755
--- a/Tools/idle/idle.py
+++ b/Tools/idle/idle.py
@@ -1,12 +1,4 @@
#! /usr/bin/env python
-import os
-import sys
-import IdleConf
-
-idle_dir = os.path.dirname(IdleConf.__file__)
-IdleConf.load(idle_dir)
-
-# defer importing Pyshell until IdleConf is loaded
import PyShell
PyShell.main()