Fix Python 3.x build -- Tkinter -> tkinter

mdboom · mdboom · commit a4f5fa52f05d · 2011-08-25T12:41:12.000-04:00
diff --git a/setupext.py b/setupext.py
@@ -848,7 +848,10 @@ def query_tcltk():
 
 def parse_tcl_config(tcl_lib_dir, tk_lib_dir):
     try:
-        import Tkinter
+        if sys.version_info[0] < 3:
+            import Tkinter
+        else:
+            import tkinter as Tkinter
     except ImportError:
         return None
 
@@ -875,7 +878,7 @@ def get_var(file, varname):
             executable="/bin/sh",
             stdout=subprocess.PIPE)
         result = p.communicate()[0]
-        return result
+        return result.decode('ascii')
 
     tcl_lib_dir = get_var(tcl_config, 'TCL_LIB_SPEC').split()[0][2:].strip()
     tcl_inc_dir = get_var(tcl_config, 'TCL_INCLUDE_SPEC')[2:].strip()
