diff options
| author | Jaime <jaime.frio@gmail.com> | 2014-10-20 14:52:21 -0700 |
|---|---|---|
| committer | Jaime <jaime.frio@gmail.com> | 2014-10-20 14:52:21 -0700 |
| commit | 4ed4aec23912346c00d5ec2850dcd457a048479e (patch) | |
| tree | f7946d6b2f5596639b69253901909ad395fc10c8 | |
| parent | df9db6ed5f9c9e315993f4efed5dba613e6cd84c (diff) | |
| parent | 270ae2c7cac71c91a52701c5b0eb7e5f6d388b14 (diff) | |
| download | numpy-4ed4aec23912346c00d5ec2850dcd457a048479e.tar.gz | |
Merge pull request #5210 from ewmoore/norm_doc
MAINT: more informative error message from linalg.norm
| -rw-r--r-- | numpy/linalg/linalg.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py index e8f7a8ab1..e35c9ac97 100644 --- a/numpy/linalg/linalg.py +++ b/numpy/linalg/linalg.py @@ -2074,6 +2074,10 @@ def norm(x, ord=None, axis=None, keepdims=False): if axis is None: axis = tuple(range(nd)) elif not isinstance(axis, tuple): + try: + axis = int(axis) + except: + raise TypeError("'axis' must be None, an integer or a tuple of integers") axis = (axis,) if len(axis) == 1: |