Skip to content

Commit

Permalink
Merge pull request numpy#6650 from sieben/list_litteral
Browse files Browse the repository at this point in the history
MAINT: use list litterals
  • Loading branch information
rgommers committed Nov 7, 2015
2 parents 7f53768 + bb0d990 commit 37e9acd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
5 changes: 1 addition & 4 deletions numpy/_build_utils/waf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions numpy/distutils/mingw32ccompiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions numpy/distutils/npy_pkg_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,7 @@ def libs(self, section="default"):
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:
Expand Down

0 comments on commit 37e9acd

Please sign in to comment.