155
155
156
156
from sage .structure .unique_representation import UniqueRepresentation
157
157
from sage .structure .category_object import normalize_names
158
- from sage .structure .element import parent
158
+ from sage .structure .element import parent , Expression
159
159
import sage .categories .commutative_rings as commutative_rings
160
160
_CommutativeRings = commutative_rings .CommutativeRings ()
161
161
import sage .categories .integral_domains as integral_domains
@@ -796,7 +796,6 @@ def _element_constructor_(self, f, prec=infinity, check=True):
796
796
prec = integer .Integer (prec )
797
797
if prec < 0 :
798
798
raise ValueError ("prec (= %s) must be non-negative" % prec )
799
- from sage .symbolic .expression import SymbolicSeries
800
799
if isinstance (f , power_series_ring_element .PowerSeries ) and f .parent () is self :
801
800
if prec >= f .prec ():
802
801
return f
@@ -813,12 +812,14 @@ def _element_constructor_(self, f, prec=infinity, check=True):
813
812
num = self .element_class (self , f .numerator (), prec , check = check )
814
813
den = self .element_class (self , f .denominator (), prec , check = check )
815
814
return self .coerce (num / den )
816
- elif isinstance (f , SymbolicSeries ):
817
- if str (f .default_variable ()) == self .variable_name ():
818
- return self .element_class (self , f .list (),
819
- f .degree (f .default_variable ()), check = check )
820
- else :
821
- raise TypeError ("Can only convert series into ring with same variable name." )
815
+ elif isinstance (f , Expression ):
816
+ from sage .symbolic .expression import SymbolicSeries
817
+ if isinstance (f , SymbolicSeries ):
818
+ if str (f .default_variable ()) == self .variable_name ():
819
+ return self .element_class (self , f .list (),
820
+ f .degree (f .default_variable ()), check = check )
821
+ else :
822
+ raise TypeError ("Can only convert series into ring with same variable name." )
822
823
return self .element_class (self , f , prec , check = check )
823
824
824
825
def construction (self ):
0 commit comments