diff options
| author | Roman Yurchak <rth.yurchak@pm.me> | 2018-12-01 19:03:55 +0100 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2018-12-01 10:03:55 -0800 |
| commit | 0ee245bc6df60b911fafe81a743ec2a68a063c20 (patch) | |
| tree | 4b32a0091c206d64ceda3f51ea134661dcaff513 /numpy/distutils | |
| parent | 69addfdfeee4226f723bb1f8d6f583221725319a (diff) | |
| download | numpy-0ee245bc6df60b911fafe81a743ec2a68a063c20.tar.gz | |
MAINT: Use list and dict comprehension when possible (#12445)
* Use list comprehension
* More list comprehension migration
* Revert key copying in dict
* A few more fixes
* More reverts
* Use dict comprehension
* Fix dict comprehension
* Address review comments
* More review comments
* Fix for empty unpacking of zip(*
* Revert zip(* unpacking altogether
* Fix dict copying
* More simplifications
Diffstat (limited to 'numpy/distutils')
| -rw-r--r-- | numpy/distutils/ccompiler.py | 6 | ||||
| -rw-r--r-- | numpy/distutils/conv_template.py | 6 | ||||
| -rw-r--r-- | numpy/distutils/exec_command.py | 4 | ||||
| -rw-r--r-- | numpy/distutils/npy_pkg_config.py | 4 |
4 files changed, 6 insertions, 14 deletions
diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py index 2c80685c3..5b7cb3fcf 100644 --- a/numpy/distutils/ccompiler.py +++ b/numpy/distutils/ccompiler.py @@ -424,10 +424,8 @@ def _compiler_to_string(compiler): v = getattr(compiler, key) mx = max(mx, len(key)) props.append((key, repr(v))) - lines = [] - format = '%-' + repr(mx+1) + 's = %s' - for prop in props: - lines.append(format % prop) + fmt = '%-' + repr(mx+1) + 's = %s' + lines = [fmt % prop for prop in props] return '\n'.join(lines) def CCompiler_show_customization(self): diff --git a/numpy/distutils/conv_template.py b/numpy/distutils/conv_template.py index 4a8746236..b33e315b4 100644 --- a/numpy/distutils/conv_template.py +++ b/numpy/distutils/conv_template.py @@ -206,10 +206,8 @@ def parse_loop_header(loophead) : dlist = [] if nsub is None : raise ValueError("No substitution variables found") - for i in range(nsub) : - tmp = {} - for name, vals in names : - tmp[name] = vals[i] + for i in range(nsub): + tmp = {name: vals[i] for name, vals in names} dlist.append(tmp) return dlist diff --git a/numpy/distutils/exec_command.py b/numpy/distutils/exec_command.py index f2916d24f..aaeca99ee 100644 --- a/numpy/distutils/exec_command.py +++ b/numpy/distutils/exec_command.py @@ -148,9 +148,7 @@ def find_executable(exe, path=None, _cache={}): def _preserve_environment( names ): log.debug('_preserve_environment(%r)' % (names)) - env = {} - for name in names: - env[name] = os.environ.get(name) + env = {name: os.environ.get(name) for name in names} return env def _update_environment( **env ): diff --git a/numpy/distutils/npy_pkg_config.py b/numpy/distutils/npy_pkg_config.py index ea16e772d..bfe8b9f77 100644 --- a/numpy/distutils/npy_pkg_config.py +++ b/numpy/distutils/npy_pkg_config.py @@ -222,9 +222,7 @@ def parse_meta(config): if not config.has_section('meta'): raise FormatError("No meta section found !") - d = {} - for name, value in config.items('meta'): - d[name] = value + d = dict(config.items('meta')) for k in ['name', 'description', 'version']: if not k in d: |