diff options
author | Francis T. O'Donovan <francis.odonovan@gmail.com> | 2015-12-12 02:07:06 -0500 |
---|---|---|
committer | Francis T. O'Donovan <francis.odonovan@gmail.com> | 2015-12-12 02:07:55 -0500 |
commit | f2fd27266f49fe6cbe8a85a03d7d43216cf7c8f7 (patch) | |
tree | a69756c8c7dc954278a2e89510a17212a6577059 | |
parent | 90a1a9fe056d84a8ddc51a50076247d658b9b669 (diff) | |
download | numpy-f2fd27266f49fe6cbe8a85a03d7d43216cf7c8f7.tar.gz |
MAINT: Resolve import naming collision and optimize imports
-rw-r--r-- | numpy/distutils/ccompiler.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py index ad235ed19..2f2d63b59 100644 --- a/numpy/distutils/ccompiler.py +++ b/numpy/distutils/ccompiler.py @@ -1,23 +1,22 @@ from __future__ import division, absolute_import, print_function -import re import os +import re import sys import types from copy import copy - -from distutils.ccompiler import * from distutils import ccompiler +from distutils.ccompiler import * from distutils.errors import DistutilsExecError, DistutilsModuleError, \ DistutilsPlatformError from distutils.sysconfig import customize_compiler from distutils.version import LooseVersion from numpy.distutils import log +from numpy.distutils.compat import get_exception from numpy.distutils.exec_command import exec_command from numpy.distutils.misc_util import cyg2win32, is_sequence, mingw32, \ quote_args, get_num_build_jobs -from numpy.distutils.compat import get_exception def replace_method(klass, method_name, func): @@ -634,7 +633,6 @@ ccompiler.gen_preprocess_options = gen_preprocess_options # that removing this fix causes f2py problems on Windows XP (see ticket #723). # Specifically, on WinXP when gfortran is installed in a directory path, which # contains spaces, then f2py is unable to find it. -import re import string _wordchars_re = re.compile(r'[^\\\'\"%s ]*' % string.whitespace) _squote_re = re.compile(r"'(?:[^'\\]|\\.)*'") |