Merge pull request #3047 from charris/2to3-callable

2to3: Fix callable.

1 files changed, 2 insertions, 1 deletions

diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index 48fc0d898..6acd9a36b 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]]