diff options
Diffstat (limited to 'numpy/distutils')
| -rw-r--r-- | numpy/distutils/_shell_utils.py | 4 | ||||
| -rw-r--r-- | numpy/distutils/command/build_ext.py | 4 | ||||
| -rw-r--r-- | numpy/distutils/system_info.py | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/numpy/distutils/_shell_utils.py b/numpy/distutils/_shell_utils.py index 5ef874900..82abd5f4e 100644 --- a/numpy/distutils/_shell_utils.py +++ b/numpy/distutils/_shell_utils.py @@ -24,12 +24,12 @@ class CommandLineParser: @staticmethod def join(argv): """ Join a list of arguments into a command line string """ - raise NotImplemented + raise NotImplementedError @staticmethod def split(cmd): """ Split a command line string into a list of arguments """ - raise NotImplemented + raise NotImplementedError class WindowsParser: diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py index ab9d585a5..ef54fb25e 100644 --- a/numpy/distutils/command/build_ext.py +++ b/numpy/distutils/command/build_ext.py @@ -281,8 +281,8 @@ class build_ext (old_build_ext): runtime_lib = os.path.join(self.extra_dll_dir, fn) copy_file(runtime_lib, shared_lib_dir) - def swig_sources(self, sources): - # Do nothing. Swig sources have beed handled in build_src command. + def swig_sources(self, sources, extensions=None): + # Do nothing. Swig sources have been handled in build_src command. return sources def build_extension(self, ext): diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index e723b85b8..4d923ad26 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -906,7 +906,6 @@ class fftw_info(system_info): == len(ver_param['includes']): dict_append(info, include_dirs=[d]) flag = 1 - incl_dirs = [d] break if flag: dict_append(info, define_macros=ver_param['macros']) @@ -1058,9 +1057,9 @@ class mkl_info(system_info): for d in paths: dirs = glob(os.path.join(d, 'mkl', '*')) dirs += glob(os.path.join(d, 'mkl*')) - for d in dirs: - if os.path.isdir(os.path.join(d, 'lib')): - return d + for sub_dir in dirs: + if os.path.isdir(os.path.join(sub_dir, 'lib')): + return sub_dir return None def __init__(self): |