summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--astroid/brain/brain_numpy_ndarray.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 68bddc2e..7a39ab2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,11 @@ Release Date: TBA
Fixes PyCQA/pylint#3640
+* Fixes a bug in the signature of the ``ndarray.__or__`` method,
+ in the ``brain_numpy_ndarray.py`` module.
+
+ Fixes #815
+
* Added a brain for ``sqlalchemy.orm.session``
* Separate string and bytes classes patching
diff --git a/astroid/brain/brain_numpy_ndarray.py b/astroid/brain/brain_numpy_ndarray.py
index 31dbe4f6..93dd3d31 100644
--- a/astroid/brain/brain_numpy_ndarray.py
+++ b/astroid/brain/brain_numpy_ndarray.py
@@ -73,7 +73,7 @@ def infer_numpy_ndarray(node, context=None):
def __mul__(self, value): return numpy.ndarray([0, 0])
def __ne__(self, value): return numpy.ndarray([0, 0])
def __neg__(self): return numpy.ndarray([0, 0])
- def __or__(self): return numpy.ndarray([0, 0])
+ def __or__(self, value): return numpy.ndarray([0, 0])
def __pos__(self): return numpy.ndarray([0, 0])
def __pow__(self): return numpy.ndarray([0, 0])
def __repr__(self): return str()