From dd13084557f46343b9fac0c02725a826d0ca397b Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Wed, 27 Feb 2013 18:34:50 -0700 Subject: 2to3: Fix callable. --- numpy/lib/function_base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'numpy/lib/function_base.py') 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]] -- cgit v1.2.1