From ea32cbb24e24472f290f7575e494caacd1bfbe05 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 12 Oct 2001 15:34:29 +0000 Subject: Suggestion from SF patch #470433 to avoid clobbering TCL_LIBRARY et al. if already set. Also adds TIX_LIBRARY (just in case). (Note that this is entirely Windows specific.) --- Lib/lib-tk/FixTk.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Lib/lib-tk/FixTk.py b/Lib/lib-tk/FixTk.py index c0af29b..029e7cd 100644 --- a/Lib/lib-tk/FixTk.py +++ b/Lib/lib-tk/FixTk.py @@ -1,6 +1,11 @@ import sys, os, _tkinter + ver = str(_tkinter.TCL_VERSION) -for t in "tcl", "tk": - v = os.path.join(sys.prefix, "tcl", t+ver) - if os.path.exists(os.path.join(v, "tclIndex")): - os.environ[t.upper() + "_LIBRARY"] = v +for t in "tcl", "tk", "tix": + key = t.upper() + "_LIBRARY" + try: + v = os.environ[key] + except KeyError: + v = os.path.join(sys.prefix, "tcl", t+ver) + if os.path.exists(os.path.join(v, "tclIndex")): + os.environ[key] = v -- cgit v0.12