sage.symbolic.expression: Merge new_Expression_from_pyobject and new_…

…Expression_force_pyobject

src/sage/symbolic/expression.pxd

@@ -2,7 +2,6 @@ cpdef bint is_Expression(x)
 cpdef _repr_Expression(x)
 cpdef _latex_Expression(x)
 cpdef new_Expression(parent, x)
-cpdef new_Expression_from_pyobject(parent, x)
-cpdef new_Expression_force_pyobject(parent, x, bint force=?, bint recursive=?)
+cpdef new_Expression_from_pyobject(parent, x, bint force=?, bint recursive=?)
 cpdef new_Expression_wild(parent, unsigned int n=?)
 cpdef new_Expression_symbol(parent, name=?, latex_name=?, domain=?)

src/sage/symbolic/expression.pyx

@@ -13305,11 +13305,6 @@ cdef Expression new_Expression_from_GEx(parent, GEx juice):
     return nex
 
 
-cpdef new_Expression_from_pyobject(parent, x):
-    cdef GEx exp = x
-    return new_Expression_from_GEx(parent, exp)
-
-
 cpdef new_Expression(parent, x):
     r"""
     Convert ``x`` into the symbolic expression ring ``parent``.
@@ -13394,7 +13389,7 @@ cpdef new_Expression(parent, x):
     return new_Expression_from_GEx(parent, exp)
 
 
-cpdef new_Expression_force_pyobject(parent, x, bint force=False, bint recursive=True):
+cpdef new_Expression_from_pyobject(parent, x, bint force=True, bint recursive=True):
     r"""
     Wrap the given Python object in a symbolic expression even if it
     cannot be coerced to the Symbolic Ring.
@@ -13405,7 +13400,7 @@ cpdef new_Expression_force_pyobject(parent, x, bint force=False, bint recursive=
 
     - ``x`` - a Python object.
 
-    - ``force`` - bool, default ``False``, if True, the Python object
+    - ``force`` - bool, default ``True``, if True, the Python object
       is taken as is without attempting coercion or list traversal.
 
     - ``recursive`` - bool, default ``True``, disables recursive
@@ -13417,6 +13412,16 @@ cpdef new_Expression_force_pyobject(parent, x, bint force=False, bint recursive=
         Rational Field
         sage: type(t)
         <type 'sage.symbolic.expression.Expression'>
+
+        sage: from sage.symbolic.expression import new_Expression_from_pyobject
+        sage: t = new_Expression_from_pyobject(SR, 17); t
+        sage: type(t)
+
+        sage: t2 = new_Expression_from_pyobject(SR, t, False); t2
+        sage: t2 is t
+
+        sage: tt = new_Expression_from_pyobject(SR, t, True); tt
+        sage: tt is t
     """
     cdef GEx exp
     cdef GExprSeq ex_seq

src/sage/symbolic/ring.pyx

@@ -39,7 +39,6 @@ from sage.symbolic.expression cimport (
     _repr_Expression,
     new_Expression,
     new_Expression_from_pyobject,
-    new_Expression_force_pyobject,
     new_Expression_wild,
     new_Expression_symbol,
 )
@@ -440,7 +439,7 @@ cdef class SymbolicRing(CommutativeRing):
             (Rational Field, (x, x + 1, x + 2), Complex Field with 53 bits
             of precision)
         """
-        return new_Expression_force_pyobject(self, x, force, recursive)
+        return new_Expression_from_pyobject(self, x, force, recursive)
 
     def wild(self, unsigned int n=0):
         r"""
@@ -1235,7 +1234,8 @@ cdef class NumpyToSRMorphism(Morphism):
             sage: SR(numpy.complex64(1jr)).pyobject().parent()
             Complex Double Field
         """
-        return new_Expression_from_pyobject(self.codomain(), self._intermediate_ring(a))
+        return new_Expression_from_pyobject(self.codomain(), self._intermediate_ring(a), True)
+
 
 cdef class UnderscoreSageMorphism(Morphism):
     def __init__(self, t, R):