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 f42327c9b39966b8eba3f6af225b7d73ec1d6855..8638a165b4b64808cf9da3ef8e5d175f95be3943 100644 (file)
--- 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()