summaryrefslogtreecommitdiff
path: root/numpy/matrixlib/tests/test_defmatrix.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-02-27 18:34:50 -0700
committerCharles Harris <charlesr.harris@gmail.com>2013-02-28 09:02:57 -0700
commitdd13084557f46343b9fac0c02725a826d0ca397b (patch)
tree09f1eaab0ae988fb4e91059224712009d1d29c23 /numpy/matrixlib/tests/test_defmatrix.py
parent0934653e151969f6912c911b5113306bd5f450f1 (diff)
downloadnumpy-dd13084557f46343b9fac0c02725a826d0ca397b.tar.gz
2to3: Fix callable.
Diffstat (limited to 'numpy/matrixlib/tests/test_defmatrix.py')
-rw-r--r--numpy/matrixlib/tests/test_defmatrix.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/matrixlib/tests/test_defmatrix.py b/numpy/matrixlib/tests/test_defmatrix.py
index 0a181fca3..dd0b9ee08 100644
--- a/numpy/matrixlib/tests/test_defmatrix.py
+++ b/numpy/matrixlib/tests/test_defmatrix.py
@@ -4,6 +4,7 @@ from numpy import matrix, asmatrix, bmat
from numpy.matrixlib.defmatrix import matrix_power
from numpy.matrixlib import mat
import numpy as np
+import collections
class TestCtor(TestCase):
def test_basic(self):
@@ -285,7 +286,7 @@ class TestMatrixReturn(TestCase):
if attrib.startswith('_') or attrib in excluded_methods:
continue
f = getattr(a, attrib)
- if callable(f):
+ if isinstance(f, collections.Callable):
# reset contents of a
a.astype('f8')
a.fill(1.0)