diff options
Diffstat (limited to 'numpy/polynomial/_polybase.py')
| -rw-r--r-- | numpy/polynomial/_polybase.py | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/numpy/polynomial/_polybase.py b/numpy/polynomial/_polybase.py index 39f5fac31..78392d2a2 100644 --- a/numpy/polynomial/_polybase.py +++ b/numpy/polynomial/_polybase.py @@ -260,7 +260,7 @@ class ABCPolyBase(object): self.window = window def __repr__(self): - format = "%s(%s, %s, %s)" + format = "%s(%s, domain=%s, window=%s)" coef = repr(self.coef)[6:-1] domain = repr(self.domain)[6:-1] window = repr(self.window)[6:-1] @@ -307,32 +307,26 @@ class ABCPolyBase(object): return self def __add__(self, other): + othercoef = self._get_coefficients(other) try: - othercoef = self._get_coefficients(other) coef = self._add(self.coef, othercoef) - except TypeError as e: - raise e - except: + except Exception: return NotImplemented return self.__class__(coef, self.domain, self.window) def __sub__(self, other): + othercoef = self._get_coefficients(other) try: - othercoef = self._get_coefficients(other) coef = self._sub(self.coef, othercoef) - except TypeError as e: - raise e - except: + except Exception: return NotImplemented return self.__class__(coef, self.domain, self.window) def __mul__(self, other): + othercoef = self._get_coefficients(other) try: - othercoef = self._get_coefficients(other) coef = self._mul(self.coef, othercoef) - except TypeError as e: - raise e - except: + except Exception: return NotImplemented return self.__class__(coef, self.domain, self.window) @@ -362,12 +356,12 @@ class ABCPolyBase(object): return res[1] def __divmod__(self, other): + othercoef = self._get_coefficients(other) try: - othercoef = self._get_coefficients(other) quo, rem = self._div(self.coef, othercoef) - except (TypeError, ZeroDivisionError) as e: + except ZeroDivisionError as e: raise e - except: + except Exception: return NotImplemented quo = self.__class__(quo, self.domain, self.window) rem = self.__class__(rem, self.domain, self.window) @@ -381,21 +375,21 @@ class ABCPolyBase(object): def __radd__(self, other): try: coef = self._add(other, self.coef) - except: + except Exception: return NotImplemented return self.__class__(coef, self.domain, self.window) def __rsub__(self, other): try: coef = self._sub(other, self.coef) - except: + except Exception: return NotImplemented return self.__class__(coef, self.domain, self.window) def __rmul__(self, other): try: coef = self._mul(other, self.coef) - except: + except Exception: return NotImplemented return self.__class__(coef, self.domain, self.window) @@ -425,7 +419,7 @@ class ABCPolyBase(object): quo, rem = self._div(other, self.coef) except ZeroDivisionError as e: raise e - except: + except Exception: return NotImplemented quo = self.__class__(quo, self.domain, self.window) rem = self.__class__(rem, self.domain, self.window) |