From: Kurt B. Kaiser <kbk@shore.net>
Date: Sat, 14 Jul 2001 05:21:37 +0000 (+0000)
Subject: py-cvs-2001_07_13 (Rev 1.4) merge
X-Git-Tag: v2.2a3~1174
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7711b5f4322b73ec6f7da519a7d80fde7608ea79;p=thirdparty%2FPython%2Fcpython.git

py-cvs-2001_07_13 (Rev 1.4) 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/idle.py b/Lib/idlelib/idle.py
index f42327c9b399..8638a165b4b6 100644
--- a/Lib/idlelib/idle.py
+++ b/Lib/idlelib/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()