From: Guido van Rossum <guido@python.org>
Date: Wed, 11 Aug 1999 02:01:00 +0000 (+0000)
Subject: Patch inspired by Moshe Zadka to search for the Icons directory in the
X-Git-Tag: v1.6a1~1018
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=292f2c53dab77422db01541bc8fdb64fb1732e92;p=thirdparty%2FPython%2Fcpython.git

Patch inspired by Moshe Zadka to search for the Icons directory in the
same directory as __file__, rather than searching for it along sys.path.
This works better when idle is a package.
---

diff --git a/Tools/idle/TreeWidget.py b/Tools/idle/TreeWidget.py
index bb348bf69ae5..bf63bdd0746b 100644
--- a/Tools/idle/TreeWidget.py
+++ b/Tools/idle/TreeWidget.py
@@ -23,11 +23,17 @@ import imp
 import ZoomHeight
 
 ICONDIR = "Icons"
-for _dir in sys.path:
-    _dir = os.path.join(_dir, ICONDIR)
-    if os.path.isdir(_dir):
-        ICONDIR = _dir
-        break
+
+# If this file is <prefix>/lib/python1.5/idle/TreeWidget.py,
+# we expect to find the icons in <prefix>/lib/python1.5/Icons/
+try:
+    _icondir = os.path.join(os.path.dirname(__file__), ICONDIR)
+except NameError:
+    _icondir = ICONDIR
+if os.path.isdir(_icondir):
+    ICONDIR = _icondir
+elif not os.path.isdir(ICONDIR):
+    raise RuntimeError, "can't find icon directory (%s)" % `ICONDIR`
 
 def listicons(icondir=ICONDIR):
     """Utility to display the available icons."""