diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/_build_utils/waf.py | 5 | ||||
| -rw-r--r-- | numpy/distutils/mingw32ccompiler.py | 4 | ||||
| -rw-r--r-- | numpy/distutils/npy_pkg_config.py | 3 |
3 files changed, 3 insertions, 9 deletions
diff --git a/numpy/_build_utils/waf.py b/numpy/_build_utils/waf.py index 263640d9e..f1b6990bb 100644 --- a/numpy/_build_utils/waf.py +++ b/numpy/_build_utils/waf.py @@ -268,10 +268,7 @@ def check_type_size(conf, type_name, expected_sizes=None, **kw): @waflib.Configure.conf def check_functions_at_once(self, funcs, **kw): - header = [] - header = ['#ifdef __cplusplus'] - header.append('extern "C" {') - header.append('#endif') + header = ['#ifdef __cplusplus', 'extern "C" {', '#endif'] for f in funcs: header.append("\tchar %s();" % f) # Handle MSVC intrinsics: force MS compiler to make a function diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py index d22a2818e..111653a82 100644 --- a/numpy/distutils/mingw32ccompiler.py +++ b/numpy/distutils/mingw32ccompiler.py @@ -244,9 +244,7 @@ def find_python_dll(): # - find it in python main dir # - in system32, # - ortherwise (Sxs), I don't know how to get it. - lib_dirs = [] - lib_dirs.append(sys.prefix) - lib_dirs.append(os.path.join(sys.prefix, 'lib')) + lib_dirs = [sys.prefix, os.path.join(sys.prefix, 'lib')] try: lib_dirs.append(os.path.join(os.environ['SYSTEMROOT'], 'system32')) except KeyError: diff --git a/numpy/distutils/npy_pkg_config.py b/numpy/distutils/npy_pkg_config.py index 6156439e1..1c801fd9c 100644 --- a/numpy/distutils/npy_pkg_config.py +++ b/numpy/distutils/npy_pkg_config.py @@ -141,8 +141,7 @@ class LibraryInfo(object): return _escape_backslash(val) def __str__(self): - m = ['Name: %s' % self.name] - m.append('Description: %s' % self.description) + m = ['Name: %s' % self.name, 'Description: %s' % self.description] if self.requires: m.append('Requires:') else: |