summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/defchararray.py4
-rw-r--r--numpy/linalg/linalg.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/numpy/core/defchararray.py b/numpy/core/defchararray.py
index 933b4d5ce..6f28b3d77 100644
--- a/numpy/core/defchararray.py
+++ b/numpy/core/defchararray.py
@@ -93,7 +93,7 @@ class chararray(ndarray):
def __mul__(self, other):
b = broadcast(self, other)
arr = b.iters[1].base
- if not issubclass(arr.dtype, integer):
+ if not issubclass(arr.dtype.type, integer):
raise ValueError, "Can only multiply by integers"
outitem = b.iters[0].base.itemsize * arr.max()
result = chararray(b.shape, outitem, self.dtype is unicode_)
@@ -105,7 +105,7 @@ class chararray(ndarray):
def __rmul__(self, other):
b = broadcast(self, other)
arr = b.iters[1].base
- if not issubclass(arr.dtype, integer):
+ if not issubclass(arr.dtype.type, integer):
raise ValueError, "Can only multiply by integers"
outitem = b.iters[0].base.itemsize * arr.max()
result = chararray(b.shape, outitem, self.dtype is unicode_)
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py
index 88d76d24e..abb65be18 100644
--- a/numpy/linalg/linalg.py
+++ b/numpy/linalg/linalg.py
@@ -208,7 +208,7 @@ def Heigenvalues(a, UPLO='L'):
return w
def _convertarray(a):
- if issubclass(a.dtype, complexfloating):
+ if issubclass(a.dtype.type, complexfloating):
if a.dtype.char == 'D':
a = _fastCT(a)
else: