diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-03-01 07:55:38 -0800 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-03-01 07:55:38 -0800 |
| commit | 3c13c0a925276130d66be490eed4ae337712cce2 (patch) | |
| tree | 204051e6c3f2ff670c95cfc734d017a9b400a2fa /numpy/distutils/command | |
| parent | 02cfcb99bc976a0bfc39529999e2a0200fb9cc2a (diff) | |
| parent | 0e4e5084e1e4a2fb369db5b4f43c500c3a9cbcd8 (diff) | |
| download | numpy-3c13c0a925276130d66be490eed4ae337712cce2.tar.gz | |
Merge pull request #3056 from charris/2to3-filter
2to3: Apply `filter` fixes. Closes #3053.
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..6e3073c43 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 = [_m for _m in self.py_modules if is_string(_m)] 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 332c31f15..d3611131f 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.__code__.co_argcount==1: s = f(build_dir) |