[Python-checkins] r67258 - sandbox/trunk/tkinter-polo/src/FixTk.py

[guilherme.polo]

Author: guilherme.polo
Date: Tue Nov 18 13:13:27 2008
New Revision: 67258

Log:
* Moved some common code to a new function (find_path);
* Removed has_key uses


Modified:
   sandbox/trunk/tkinter-polo/src/FixTk.py

Modified: sandbox/trunk/tkinter-polo/src/FixTk.py
==============================================================================
--- sandbox/trunk/tkinter-polo/src/FixTk.py	(original)
+++ sandbox/trunk/tkinter-polo/src/FixTk.py	Tue Nov 18 13:13:27 2008
@@ -1,41 +1,41 @@
-import sys, os
-
 # Delay import _tkinter until we have set TCL_LIBRARY,
 # so that Tcl_FindExecutable has a chance to locate its
 # encoding directory.
-
+#
 # Unfortunately, we cannot know the TCL_LIBRARY directory
 # if we don't know the tcl version, which we cannot find out
 # without import Tcl. Fortunately, Tcl will itself look in
-# <TCL_LIBRARY>\..\tcl<TCL_VERSION>, so anything close to
+# <TCL_LIBRARY>/../tcl<TCL_VERSION>, so anything close to
 # the real Tcl library will do.
 
-prefix = os.path.join(sys.prefix,"tcl")
+import os
+import sys
+
+def find_path(prefix, basename, env_var):
+    for name in os.listdir(prefix):
+        if name.startswith(basename):
+            pkgdir = os.path.join(prefix, name)
+            if os.path.isdir(pkgdir):
+                os.environ[env_var] = pkgdir
+
+prefix = os.path.join(sys.prefix, "tcl")
 if not os.path.exists(prefix):
     # devdir/../tcltk/lib
     prefix = os.path.join(sys.prefix, os.path.pardir, "tcltk", "lib")
     prefix = os.path.abspath(prefix)
 # if this does not exist, no further search is needed
 if os.path.exists(prefix):
-    if not os.environ.has_key("TCL_LIBRARY"):
-        for name in os.listdir(prefix):
-            if name.startswith("tcl"):
-                tcldir = os.path.join(prefix,name)
-                if os.path.isdir(tcldir):
-                    os.environ["TCL_LIBRARY"] = tcldir
-    # Compute TK_LIBRARY, knowing that it has the same version
-    # as Tcl
+    if not "TCL_LIBRARY" in os.environ:
+        find_path(prefix, 'tcl', 'TCL_LIBRARY')
+
+    # Compute TK_LIBRARY, knowing that it has the same version as Tcl
     import _tkinter
     ver = str(_tkinter.TCL_VERSION)
-    if not os.environ.has_key("TK_LIBRARY"):
-        v = os.path.join(prefix, 'tk'+ver)
+    if not "TK_LIBRARY" in os.environ:
+        v = os.path.join(prefix, 'tk%s' % ver)
         if os.path.exists(os.path.join(v, "tclIndex")):
             os.environ['TK_LIBRARY'] = v
-    # We don't know the Tix version, so we must search the entire
-    # directory
-    if not os.environ.has_key("TIX_LIBRARY"):
-        for name in os.listdir(prefix):
-            if name.startswith("tix"):
-                tixdir = os.path.join(prefix,name)
-                if os.path.isdir(tixdir):
-                    os.environ["TIX_LIBRARY"] = tixdir
+
+    # We don't know the Tix version, so we must search the entire directory
+    if not "TIX_LIBRARY" in os.environ:
+        find_path(prefix, 'tix', 'TIX_LIBRARY')