merge from distutils-revamp branch (step 1)

- minor cleanups
- find_executable returns None when no file found (instead of having to
  check with os.path.isfile)

1 files changed, 5 insertions, 4 deletions

diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py
index b3c131316..bf077bacc 100644
--- a/numpy/distutils/ccompiler.py
+++ b/numpy/distutils/ccompiler.py
@@ -259,6 +259,8 @@ def CCompiler_get_version(self, force=0, ok_status=[0]):
         version_cmd = self.version_cmd
     except AttributeError:
         return None
+    if not version_cmd or not version_cmd[0]:
+        return None
     cmd = ' '.join(version_cmd)
     try:
         matcher = self.version_match
@@ -278,9 +280,7 @@ def CCompiler_get_version(self, force=0, ok_status=[0]):
     version = None
     if status in ok_status:
         version = matcher(output)
-        if not version:
-            log.warn("Couldn't match compiler version for %r" % (output,))
-        else:
+        if version:
             version = LooseVersion(version)
     self.version = version
     return version
@@ -341,7 +341,8 @@ def new_compiler (plat=None,
     try:
         __import__ (module_name)
     except ImportError, msg:
-        print msg,'in numpy.distutils, trying from distutils..'
+        log.info('%s in numpy.distutils; trying from distutils',
+                 str(msg))
         module_name = module_name[6:]
         try:
             __import__(module_name)