Merge pull request #277 from isuruf/sets

Use sympy.S.EmptySet as sympy.EmptySet will change

Author: isuruf

symengine/lib/symengine_wrapper.pyx

@@ -427,8 +427,10 @@ def sympy2symengine(a, raise_error=False):
         return piecewise(*(a.args))
     elif isinstance(a, sympy.Interval):
         return interval(*(a.args))
-    elif isinstance(a, sympy.EmptySet):
+    elif a == sympy.S.EmptySet:
         return emptyset()
+    elif a == sympy.S.UniversalSet:
+        return universalset()
     elif isinstance(a, sympy.FiniteSet):
         return finiteset(*(a.args))
     elif isinstance(a, sympy.Contains):
@@ -2923,7 +2925,7 @@ class EmptySet(Set):
 
     def _sympy_(self):
         import sympy
-        return sympy.EmptySet()
+        return sympy.S.EmptySet
 
     @property
     def func(self):

symengine/tests/test_sympy_conv.py

@@ -9,7 +9,7 @@
         KroneckerDelta, LeviCivita, erf, erfc, lowergamma, uppergamma,
         loggamma, beta, polygamma, sign, floor, ceiling, conjugate, And,
         Or, Not, Xor, Piecewise, Interval, EmptySet, FiniteSet, Contains,
-        Union, Complement)
+        Union, Complement, UniversalSet)
 import unittest
 
 # Note: We test _sympy_() for SymEngine -> SymPy conversion, as those are
@@ -703,8 +703,11 @@ def test_sets():
     assert Interval(x, y)._sympy_() == sympy.Interval(x1, y1)
     assert sympify(sympy.Interval(x1, y1)) == Interval(x, y)
 
-    assert sympify(sympy.EmptySet()) == EmptySet()
-    assert sympy.EmptySet() == EmptySet()._sympy_()
+    assert sympify(sympy.S.EmptySet) == EmptySet()
+    assert sympy.S.EmptySet == EmptySet()._sympy_()
+
+    assert sympify(sympy.S.UniversalSet) == UniversalSet()
+    assert sympy.S.UniversalSet == UniversalSet()._sympy_()
 
     assert FiniteSet(x, y) == FiniteSet(x1, y1)
     assert FiniteSet(x1, y) == FiniteSet(x1, y1)