Py3k: fix unixccompiler + exec_command exception/print stmts.

1 files changed, 11 insertions, 5 deletions

diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py
index f3a4b7cbd..cc1a9a4f9 100644
--- a/numpy/distutils/unixccompiler.py
+++ b/numpy/distutils/unixccompiler.py
@@ -7,8 +7,12 @@ import os
 from distutils.errors import DistutilsExecError, CompileError
 from distutils.unixccompiler import *
 from numpy.distutils.ccompiler import replace_method
+from numpy.distutils.compat import get_exception
 
-import log
+if sys.version_info[0] < 3:
+    import log
+else:
+    from numpy.distutils import log
 
 # Note that UnixCCompiler._compile appeared in Python 2.3
 def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
@@ -17,8 +21,9 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
     try:
         self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
                    extra_postargs, display = display)
-    except DistutilsExecError, msg:
-        raise CompileError, msg
+    except DistutilsExecError:
+        msg = str(get_exception())
+        raise CompileError(msg)
 
 replace_method(UnixCCompiler, '_compile', UnixCCompiler__compile)
 
@@ -83,8 +88,9 @@ def UnixCCompiler_create_static_lib(self, objects, output_libname,
             try:
                 self.spawn(self.ranlib + [output_filename],
                            display = display)
-            except DistutilsExecError, msg:
-                raise LibError, msg
+            except DistutilsExecError:
+                msg = str(get_exception())
+                raise LibError(msg)
     else:
         log.debug("skipping %s (up-to-date)", output_filename)
     return