wrap calls to tk.getvar with str() in setupext.py. Was returning a

ddale · ddale · commit fedbec632373 · 2006-08-29T19:56:40.000Z
Tcl_Obj on some systems, strings on others.

svn path=/trunk/matplotlib/; revision=2727
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2006-08-29 setupext.py: wrap calls to tk.getvar() with str(). On some 
+           systems, getvar returns a Tcl_Obj instead of a string - DSD
+
 2006-08-28 mathtext2.py: Sub/superscripts can now be complex (i.e.
            fractions etc.). The demo is also updated - ES
 
diff --git a/setupext.py b/setupext.py
@@ -354,18 +354,18 @@ def find_tcltk():
         o.tkv = ""
     else:
         tk.withdraw()
-        o.tcl_lib = os.path.normpath(os.path.join((tk.getvar('tcl_library')), '../'))
+        o.tcl_lib = os.path.normpath(os.path.join(str(tk.getvar('tcl_library')), '../'))
         o.tk_lib = os.path.normpath(os.path.join(str(tk.getvar('tk_library')), '../'))
         o.tkv = str(Tkinter.TkVersion)[:3]
-        o.tcl_inc = os.path.normpath(os.path.join((tk.getvar('tcl_library')), 
+        o.tcl_inc = os.path.normpath(os.path.join(str(tk.getvar('tcl_library')), 
                     '../../include/tcl'+o.tkv))
         if not os.path.exists(o.tcl_inc):
-            o.tcl_inc = os.path.normpath(os.path.join((tk.getvar('tcl_library')), 
+            o.tcl_inc = os.path.normpath(os.path.join(str(tk.getvar('tcl_library')), 
                         '../../include'))
-        o.tk_inc = os.path.normpath(os.path.join((tk.getvar('tk_library')), 
+        o.tk_inc = os.path.normpath(os.path.join(str(tk.getvar('tk_library')), 
                     '../../include/tk'+o.tkv))
         if not os.path.exists(o.tk_inc):
-            o.tk_inc = os.path.normpath(os.path.join((tk.getvar('tk_library')), 
+            o.tk_inc = os.path.normpath(os.path.join(str(tk.getvar('tk_library')), 
                         '../../include'))
             
         if ((not os.path.exists(os.path.join(o.tk_inc,'tk.h'))) and
