Remove win32 getstatusoutput in favor of explicit check_include_file

blink1073 · blink1073 · commit f5de590ce0f4 · 2014-09-13T14:38:59.000-05:00
diff --git a/setupext.py b/setupext.py
@@ -48,22 +48,6 @@ def check_output(*popenargs, **kwargs):
         from commands import getstatusoutput
     else:
         from subprocess import getstatusoutput
-else:
-    def getstatusoutput(cmd):
-        """Return (status, output) of executing cmd in a shell."""
-        import subprocess as sp
-        try:
-            proc = sp.Popen(cmd, stdout=sp.PIPE, stderr=sp.PIPE)
-        except OSError:
-            return 1, ''
-        stdout, stderr = proc.communicate()
-        sts = proc.returncode
-        text = '\n'.join(stdout, stderr)
-        if sts is None:
-            sts = 0
-        if text[-1:] == '\n':
-            text = text[:-1]
-        return sts, text
 
 
 if PY3:
@@ -136,10 +120,8 @@ def has_include_file(include_dirs, filename):
     Returns `True` if `filename` can be found in one of the
     directories in `include_dirs`.
     """
-    for var in ['INCLUDE', 'CPATH', 'C_INCLUDE_PATH',
-                       'CPLUS_INCLUDE_PATH']:
-        env_include = os.getenv(var, '')
-        include_dirs += env_include.replace(':', ';').split(';')
+    if sys.platform == 'win32':
+        include_dirs += os.environ.get('INCLUDE', '.').split(';')
     for dir in include_dirs:
         if os.path.exists(os.path.join(dir, filename)):
             return True
@@ -174,6 +156,13 @@ def get_base_dirs():
     return basedir_map.get(sys.platform, ['/usr/local', '/usr'])
 
 
+def get_include_dirs():
+    """
+    Returns a list of standard include directories on this platform.
+    """
+    return [os.path.join(d, 'include') for d in get_base_dirs()]
+
+
 def is_min_version(found, minversion):
     """
     Returns `True` if `found` is at least as high a version as
@@ -945,7 +934,8 @@ class FreeType(SetupPackage):
 
     def check(self):
         if sys.platform == 'win32':
-            return "Unknown version"
+            check_include_file(get_include_dirs(), 'ft2build.h', 'freetype')
+            return 'Using unknown version found on system.'
 
         status, output = getstatusoutput("freetype-config --ftversion")
         if status == 0:
@@ -1021,6 +1011,10 @@ class Png(SetupPackage):
     name = "png"
 
     def check(self):
+        if sys.platform == 'win32':
+            check_include_file(get_include_dirs(), 'png.h', 'png')
+            return 'Using unknown version found on system.'
+
         status, output = getstatusoutput("libpng-config --version")
         if status == 0:
             version = output
@@ -1032,9 +1026,7 @@ def check(self):
                 'libpng', 'png.h',
                 min_version='1.2', version=version)
         except CheckFailed as e:
-            include_dirs = [
-                os.path.join(dir, 'include') for dir in get_base_dirs()]
-            if has_include_file(include_dirs, 'png.h'):
+            if has_include_file(get_include_dirs(), 'png.h'):
                 return str(e) + ' Using unknown version found on system.'
             raise
 
@@ -1065,7 +1057,7 @@ def check(self):
             # present on this system, so check if the header files can be
             # found.
             include_dirs = [
-                os.path.join(x, 'include', 'qhull') for x in get_base_dirs()]
+                os.path.join(x, 'qhull') for x in get_include_dirs()]
             if has_include_file(include_dirs, 'qhull_a.h'):
                 return 'Using system Qhull (version unknown, no pkg-config info)'
             else:
