py-cvs-2001_07_13 (Rel 1.7) merge

"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." --GvR

diff --git a/Lib/idlelib/IdleConf.py b/Lib/idlelib/IdleConf.py
index 37f4ef1b0c75060188b598ed8096e910d4616807..8eaa8e06b58eef2045abc0eda63c305edb53d767 100644 (file)
--- a/Lib/idlelib/IdleConf.py
+++ b/Lib/idlelib/IdleConf.py
@@ -110,3 +110,4 @@ def load(dir):
                    os.path.join(homedir, ".idle")))
 
 idleconf = IdleConfParser()
+load(os.path.dirname(__file__))