py-cvs merge, idle_dir loading changed

diff --git a/Lib/idlelib/idle.py b/Lib/idlelib/idle.py
index 71fdce56bb1e360afc06ea03ec943a5563e0f305..f42327c9b39966b8eba3f6af225b7d73ec1d6855 100644 (file)
--- a/Lib/idlelib/idle.py
+++ b/Lib/idlelib/idle.py
@@ -4,7 +4,7 @@ import os
 import sys
 import IdleConf
 
-idle_dir = os.path.split(sys.argv[0])[0]
+idle_dir = os.path.dirname(IdleConf.__file__)
 IdleConf.load(idle_dir)
 
 # defer importing Pyshell until IdleConf is loaded