From: Kurt B. Kaiser <kbk@shore.net>
Date: Sat, 14 Jul 2001 04:51:06 +0000 (+0000)
Subject: py-cvs-2001_07_13 (Rel 1.7) merge
X-Git-Tag: v2.2a3~1179
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8bf5b2027aac3c614657794ab1c38827755b092a;p=thirdparty%2FPython%2Fcpython.git

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 37f4ef1b0c75..8eaa8e06b58e 100644
--- 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__))