fix #807 : fixed binary operations between a session and an array objects

Author: alixdamman

doc/source/changes/version_0_32.rst.inc

@@ -55,4 +55,4 @@ Miscellaneous improvements
 Fixes
 ^^^^^
 
-* fixed something (closes :issue:`1`).
+* fixed binary operations between a session and an array object (closes :issue:`807`).

larray/core/session.py

@@ -935,7 +935,7 @@ def _binop(opname, arrays_only=True):
         def opmethod(self, other):
             self_keys = set(self.keys())
             all_keys = list(self.keys())
-            if hasattr(other, 'keys'):
+            if not isinstance(other, LArray) and hasattr(other, 'keys'):
                 all_keys += [n for n in other.keys() if n not in self_keys]
             with np.errstate(call=_session_float_error_handler):
                 res = []

larray/tests/test_session.py

@@ -8,7 +8,7 @@
 import pytest
 
 from larray.tests.common import assert_array_nan_equal, inputpath, tmp_path, meta, needs_xlwings
-from larray import (Session, Axis, LArray, Group, isnan, zeros_like, ndtest, ones_like,
+from larray import (Session, Axis, LArray, Group, isnan, zeros_like, ndtest, ones_like, ones, full,
                     local_arrays, global_arrays, arrays)
 from larray.util.misc import pickle
 
@@ -456,6 +456,18 @@ def test_sub(session):
     assert diff.a01 is a01
     assert diff.c is c
 
+    # session - array
+    axes = [a, b]
+    sess = Session([('a', a), ('a01', a01), ('c', c), ('e', ndtest(axes)),
+                    ('f', full(axes, fill_value=3)), ('g', ndtest('c=c0..c2'))])
+    diff = sess - ones(axes)
+    assert_array_nan_equal(diff['e'], sess['e'] - ones(axes))
+    assert_array_nan_equal(diff['f'], sess['f'] - ones(axes))
+    assert_array_nan_equal(diff['g'], sess['g'] - ones(axes))
+    assert diff.a is a
+    assert diff.a01 is a01
+    assert diff.c is c
+
 
 def test_rsub(session):
     sess = session