From 370b6506f128460371484a50c813d66e64582f44 Mon Sep 17 00:00:00 2001 From: Eric Wieser Date: Wed, 8 Feb 2017 22:05:11 +0000 Subject: MAINT: Use normalize_axis_index in all python axis checking As a result, some exceptions change from ValueError to IndexError This also changes the exception types raised in places where normalize_axis_index is not quite appropriate --- numpy/polynomial/hermite.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'numpy/polynomial/hermite.py') diff --git a/numpy/polynomial/hermite.py b/numpy/polynomial/hermite.py index 0ebae2027..a03fe722c 100644 --- a/numpy/polynomial/hermite.py +++ b/numpy/polynomial/hermite.py @@ -62,6 +62,7 @@ from __future__ import division, absolute_import, print_function import warnings import numpy as np import numpy.linalg as la +from numpy.core.multiarray import normalize_axis_index from . import polyutils as pu from ._polybase import ABCPolyBase @@ -700,10 +701,7 @@ def hermder(c, m=1, scl=1, axis=0): raise ValueError("The order of derivation must be non-negative") if iaxis != axis: raise ValueError("The axis must be integer") - if not -c.ndim <= iaxis < c.ndim: - raise ValueError("The axis is out of range") - if iaxis < 0: - iaxis += c.ndim + iaxis = normalize_axis_index(iaxis, c.ndim) if cnt == 0: return c @@ -822,10 +820,7 @@ def hermint(c, m=1, k=[], lbnd=0, scl=1, axis=0): raise ValueError("Too many integration constants") if iaxis != axis: raise ValueError("The axis must be integer") - if not -c.ndim <= iaxis < c.ndim: - raise ValueError("The axis is out of range") - if iaxis < 0: - iaxis += c.ndim + iaxis = normalize_axis_index(iaxis, c.ndim) if cnt == 0: return c -- cgit v1.2.1