summaryrefslogtreecommitdiff
path: root/numpy/linalg/linalg.py
diff options
context:
space:
mode:
authorDavid Cournapeau <cournape@gmail.com>2009-03-02 14:26:50 +0000
committerDavid Cournapeau <cournape@gmail.com>2009-03-02 14:26:50 +0000
commit9505ef3f9bbdc13d6c4e76c66dbc273650f80297 (patch)
tree0e89d6309cd2520d0f692ca0ba08b94629834ddd /numpy/linalg/linalg.py
parent1cf5461fb0867179846c5f89bc5e91aba57fb242 (diff)
downloadnumpy-9505ef3f9bbdc13d6c4e76c66dbc273650f80297.tar.gz
BUG: fix #786, bad exception for wrong order for linalg.norm.
Diffstat (limited to 'numpy/linalg/linalg.py')
-rw-r--r--numpy/linalg/linalg.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py
index 583ab2f71..1570407ff 100644
--- a/numpy/linalg/linalg.py
+++ b/numpy/linalg/linalg.py
@@ -1378,6 +1378,10 @@ def norm(x, ord=None):
elif ord == 2:
return sqrt(((x.conj()*x).real).sum()) # special case for speedup
else:
+ try:
+ ord + 1
+ except TypeError:
+ raise ValueError, "Invalid norm order for vectors."
return ((abs(x)**ord).sum())**(1.0/ord)
elif nd == 2:
if ord == 2: