summaryrefslogtreecommitdiff
path: root/numpy/core/numeric.py
diff options
context:
space:
mode:
authorEric Wieser <wieser.eric@gmail.com>2017-02-09 18:22:00 +0000
committerEric Wieser <wieser.eric@gmail.com>2017-02-20 22:03:07 +0000
commiteb642f1b6533fcd92e366377f5859e4ea56d5eed (patch)
tree01969f8ba2d5316858caf2d017dcf6a09157c495 /numpy/core/numeric.py
parent370b6506f128460371484a50c813d66e64582f44 (diff)
downloadnumpy-eb642f1b6533fcd92e366377f5859e4ea56d5eed.tar.gz
ENH: For compatibility, use an exception type that subclasses both original types
Diffstat (limited to 'numpy/core/numeric.py')
-rw-r--r--numpy/core/numeric.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py
index a5cb5bb31..e7307a870 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -27,7 +27,7 @@ from .umath import (invert, sin, UFUNC_BUFSIZE_DEFAULT, ERR_IGNORE,
ERR_DEFAULT, PINF, NAN)
from . import numerictypes
from .numerictypes import longlong, intc, int_, float_, complex_, bool_
-from ._internal import TooHardError
+from ._internal import TooHardError, AxisError
bitwise_not = invert
ufunc = type(sin)
@@ -65,7 +65,7 @@ __all__ = [
'True_', 'bitwise_not', 'CLIP', 'RAISE', 'WRAP', 'MAXDIMS', 'BUFSIZE',
'ALLOW_THREADS', 'ComplexWarning', 'full', 'full_like', 'matmul',
'shares_memory', 'may_share_memory', 'MAY_SHARE_BOUNDS', 'MAY_SHARE_EXACT',
- 'TooHardError',
+ 'TooHardError', 'AxisError'
]