diff options
| author | Julian Taylor <juliantaylor108@gmail.com> | 2017-05-10 18:19:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-10 18:19:52 +0200 |
| commit | 14ff219a13e194c5e7995218fea3c7648eb1c875 (patch) | |
| tree | bcb6992c727bb477d6f37be40a2b03b77d4b19bc /numpy/core/_internal.py | |
| parent | 82e923fd8879e557bc0b0c9de63e0500d0b190a0 (diff) | |
| parent | 8f9eeef2abde02f03249c3ddfcce68bcdf0ee644 (diff) | |
| download | numpy-14ff219a13e194c5e7995218fea3c7648eb1c875.tar.gz | |
Merge pull request #9087 from eric-wieser/fix-ufunc-resolution
BUG: __array_ufunc__ should always be looked up on the type, never the instance
Diffstat (limited to 'numpy/core/_internal.py')
| -rw-r--r-- | numpy/core/_internal.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/_internal.py b/numpy/core/_internal.py index f7f579c75..10fcbfdfe 100644 --- a/numpy/core/_internal.py +++ b/numpy/core/_internal.py @@ -688,7 +688,7 @@ class AxisError(ValueError, IndexError): super(AxisError, self).__init__(msg) -def array_ufunc_errmsg_formatter(ufunc, method, *inputs, **kwargs): +def array_ufunc_errmsg_formatter(dummy, ufunc, method, *inputs, **kwargs): """ Format the error message for when __array_ufunc__ gives up. """ args_string = ', '.join(['{!r}'.format(arg) for arg in inputs] + ['{}={!r}'.format(k, v) |