diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-02-27 18:34:50 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-02-28 09:02:57 -0700 |
| commit | dd13084557f46343b9fac0c02725a826d0ca397b (patch) | |
| tree | 09f1eaab0ae988fb4e91059224712009d1d29c23 /numpy/lib/function_base.py | |
| parent | 0934653e151969f6912c911b5113306bd5f450f1 (diff) | |
| download | numpy-dd13084557f46343b9fac0c02725a826d0ca397b.tar.gz | |
2to3: Fix callable.
Diffstat (limited to 'numpy/lib/function_base.py')
| -rw-r--r-- | numpy/lib/function_base.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index 02dd0ceaf..7987ad309 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -30,6 +30,7 @@ from arraysetops import setdiff1d from utils import deprecate from _compiled_base import add_newdoc_ufunc import numpy as np +import collections def iterable(y): @@ -707,7 +708,7 @@ def piecewise(x, condlist, funclist, *args, **kw): y = zeros(x.shape, x.dtype) for k in range(n): item = funclist[k] - if not callable(item): + if not isinstance(item, collections.Callable): y[condlist[k]] = item else: vals = x[condlist[k]] |