summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2017-08-06 11:33:28 -0500
committerGitHub <noreply@github.com>2017-08-06 11:33:28 -0500
commitd6539868b353e211b4aaa3a683101e094b3ee1df (patch)
tree03185ca031dbe199ba22549ac990872b5e461df3
parentdfba08642ec76cee99e7d78e20865e2e63f89609 (diff)
parent2d4a09ca8b0a9781e2c164f5ea233a9794e2b78b (diff)
downloadnumpy-d6539868b353e211b4aaa3a683101e094b3ee1df.tar.gz
Merge pull request #9521 from eric-wieser/numbers.Number
BUG: Make issubclass(np.number, numbers.Number) return true
-rw-r--r--numpy/core/numerictypes.py1
-rw-r--r--numpy/core/tests/test_abc.py13
2 files changed, 14 insertions, 0 deletions
diff --git a/numpy/core/numerictypes.py b/numpy/core/numerictypes.py
index 275bb3fea..5a8d9abe0 100644
--- a/numpy/core/numerictypes.py
+++ b/numpy/core/numerictypes.py
@@ -952,6 +952,7 @@ def _register_types():
numbers.Integral.register(integer)
numbers.Complex.register(inexact)
numbers.Real.register(floating)
+ numbers.Number.register(number)
_register_types()
diff --git a/numpy/core/tests/test_abc.py b/numpy/core/tests/test_abc.py
index 515a76a21..77cf40620 100644
--- a/numpy/core/tests/test_abc.py
+++ b/numpy/core/tests/test_abc.py
@@ -3,9 +3,22 @@ from __future__ import division, absolute_import, print_function
from numpy.testing import assert_, run_module_suite
import numbers
+
+import numpy as np
from numpy.core.numerictypes import sctypes
class TestABC(object):
+ def test_abstract(self):
+ assert_(issubclass(np.number, numbers.Number))
+
+ assert_(issubclass(np.inexact, numbers.Complex))
+ assert_(issubclass(np.complexfloating, numbers.Complex))
+ assert_(issubclass(np.floating, numbers.Real))
+
+ assert_(issubclass(np.integer, numbers.Integral))
+ assert_(issubclass(np.signedinteger, numbers.Integral))
+ assert_(issubclass(np.unsignedinteger, numbers.Integral))
+
def test_floats(self):
for t in sctypes['float']:
assert_(isinstance(t(), numbers.Real),