diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-02-28 10:58:40 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-02-28 10:58:40 -0700 |
| commit | b990ed5a18b58715fa1e13642bc7f6761e597818 (patch) | |
| tree | 1c00d8287357e42d3e4cbc08291b939851ad10c1 /numpy/distutils/command | |
| parent | 0934653e151969f6912c911b5113306bd5f450f1 (diff) | |
| download | numpy-b990ed5a18b58715fa1e13642bc7f6761e597818.tar.gz | |
2to3: Apply `filter` fixes. Closes #3053.
Generally, this involves using list comprehension, or explicit list
construction as `filter` is an iterator in Python 3.
Diffstat (limited to 'numpy/distutils/command')
| -rw-r--r-- | numpy/distutils/command/build_py.py | 2 | ||||
| -rw-r--r-- | numpy/distutils/command/build_src.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/numpy/distutils/command/build_py.py b/numpy/distutils/command/build_py.py index 4c02e4136..2070570ff 100644 --- a/numpy/distutils/command/build_py.py +++ b/numpy/distutils/command/build_py.py @@ -21,7 +21,7 @@ class build_py(old_build_py): def find_modules(self): old_py_modules = self.py_modules[:] - new_py_modules = filter(is_string, self.py_modules) + new_py_modules = list(filter(is_string, self.py_modules)) self.py_modules[:] = new_py_modules modules = old_build_py.find_modules(self) self.py_modules[:] = old_py_modules diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py index 7bf3b43ce..75dc5e12b 100644 --- a/numpy/distutils/command/build_src.py +++ b/numpy/distutils/command/build_src.py @@ -186,8 +186,8 @@ class build_src(build_ext.build_ext): build_dir = self.get_package_dir('.'.join(d.split(os.sep))) else: build_dir = os.path.join(self.build_src,d) - funcs = filter(lambda f:hasattr(f, '__call__'), files) - files = filter(lambda f:not hasattr(f, '__call__'), files) + funcs = [f for f in files if hasattr(f, '__call__')] + files = [f for f in files if not hasattr(f, '__call__')] for f in funcs: if f.func_code.co_argcount==1: s = f(build_dir) |
