bug fix in Union

Author: dimitri-yatsenko

datajoint/relational_operand.py

@@ -605,7 +605,7 @@ def __init__(self, arg=None):
     def create(cls, arg1, arg2):
         obj = cls()
         if inspect.isclass(arg2) and issubclass(arg2, RelationalOperand):
-            obj = obj()  # instantiate if a class
+            arg2 = arg2()  # instantiate if a class
         if not isinstance(arg1, RelationalOperand) or not isinstance(arg2, RelationalOperand):
             raise DataJointError('a relation can only be unioned with another relation')
         if arg1.connection != arg2.connection:

tests/test_relational_operand.py

@@ -132,7 +132,7 @@ def test_join():
 
     @staticmethod
     def test_issue_463():
-        assert_equal(((A & B) * B).fetch().size, len(A*B))
+        assert_equal(((A & B) * B).fetch().size, len(A * B))
 
 
     @staticmethod
@@ -153,10 +153,10 @@ def test_project():
 
     @staticmethod
     def test_union():
-        x = set(zip(*IJ().fetch('i','j')))
-        y = set(zip(*JI().fetch('i','j')))
+        x = set(zip(*IJ.fetch('i','j')))
+        y = set(zip(*JI.fetch('i','j')))
         assert_true(len(x) > 0 and len(y) > 0 and len(IJ() * JI()) < len(x))  # ensure the IJ and JI are non-trivial
-        z = set(zip(*(IJ() + JI()).fetch('i','j')))   # union
+        z = set(zip(*(IJ + JI).fetch('i','j')))   # union
         assert_set_equal(x.union(y), z)
 
     @staticmethod
@@ -168,7 +168,7 @@ def test_preview():
 
     @staticmethod
     def test_heading_repr():
-        x = A() * D()
+        x = A * D
         s = repr(x.heading)
         assert_equal(len(list(1 for g in s.split('\n') if g.strip() and not g.strip().startswith(('-', '#')))),
                      len(x.heading.attributes))