Merge branch 'v1.0.x-maint'

Author: efiring

examples/api/font_file.py

@@ -17,7 +17,7 @@
 
 if sys.platform == 'win32':
     fpath = 'C:\\Windows\\Fonts\\Tahoma.ttf'
-elif sys.platform == 'linux2':
+elif sys.platform.startswith('linux'):
     fonts = ['/usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf',
       '/usr/share/fonts/truetype/ttf-liberation/LiberationSans-BoldItalic.ttf',
       '/usr/share/fonts/truetype/msttcorefonts/Comic_Sans_MS.ttf',

setupext.py

@@ -859,11 +859,11 @@ def get_var(file, varname):
         result = p.communicate()[0]
         return result
 
-    tcl_lib_dir = get_var(tcl_config, 'TCL_LIB_SPEC').split()[0][2:]
-    tcl_inc_dir = get_var(tcl_config, 'TCL_INCLUDE_SPEC')[2:]
+    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()
     tcl_lib = get_var(tcl_config, 'TCL_LIB_FLAG')[2:].strip()
 
-    tk_lib_dir = get_var(tk_config, 'TK_LIB_SPEC').split()[0][2:]
+    tk_lib_dir = get_var(tk_config, 'TK_LIB_SPEC').split()[0][2:].strip()
     tk_inc_dir = get_var(tk_config, 'TK_INCLUDE_SPEC').strip()
     if tk_inc_dir == '':
         tk_inc_dir = tcl_inc_dir