@@ -95,7 +95,7 @@ class initialization directly.
9595from sage .rings .morphism import RingHomomorphism_im_gens
9696from sage .rings .polynomial .multi_polynomial_ring_base import MPolynomialRing_base
9797from sage .rings .polynomial .polynomial_ring_constructor import PolynomialRing
98- from sage .rings .polynomial .polynomial_ring import PolynomialRing_general
98+ from sage .rings .polynomial .polynomial_ring import PolynomialRing_generic
9999from sage .rings .quotient_ring import QuotientRing_generic
100100from sage .rings .rational_field import QQ
101101from sage .rings .real_mpfr import RealField
@@ -385,7 +385,7 @@ def __classcall_private__(cls, morphism_or_polys, domain=None, names=None):
385385 polys = list (morphism_or_polys )
386386 if len (polys ) == 1 :
387387 raise ValueError ("list/tuple must have at least 2 polynomials" )
388- test = lambda x : isinstance (x , (PolynomialRing_general , MPolynomialRing_base ))
388+ test = lambda x : isinstance (x , (PolynomialRing_generic , MPolynomialRing_base ))
389389 if not all (test (poly .parent ()) for poly in polys ):
390390 try :
391391 polys = [poly .lift () for poly in polys ]
@@ -395,7 +395,7 @@ def __classcall_private__(cls, morphism_or_polys, domain=None, names=None):
395395 # homogenize!
396396 f = morphism_or_polys
397397 aff_CR = f .parent ()
398- if (not isinstance (aff_CR , PolynomialRing_general ) and not isinstance ( aff_CR , FractionField_generic )
398+ if (not isinstance (aff_CR , ( PolynomialRing_generic , FractionField_generic ) )
399399 and not (isinstance (aff_CR , MPolynomialRing_base ) and aff_CR .ngens () == 1 )):
400400 msg = '{} is not a single variable polynomial or rational function'
401401 raise ValueError (msg .format (f ))
@@ -3533,7 +3533,7 @@ def affine_preperiodic_model(self, m, n, return_conjugation=False):
35333533 if hyperplane_found :
35343534 break
35353535 else :
3536- if isinstance (R , (PolynomialRing_general ,
3536+ if isinstance (R , (PolynomialRing_generic ,
35373537 MPolynomialRing_base ,
35383538 FractionField_generic )):
35393539 # for polynomial rings, we can get an infinite family of hyperplanes
@@ -4597,7 +4597,7 @@ def preperiodic_points(self, m, n, **kwds):
45974597 for k in ZZ (n ).divisors ():
45984598 if ZZ (n / k ).is_prime ():
45994599 Sn .append (k )
4600- if isinstance (R , (PolynomialRing_general ,
4600+ if isinstance (R , (PolynomialRing_generic ,
46014601 MPolynomialRing_base )):
46024602 phi = FlatteningMorphism (CR )
46034603 flatCR = phi .codomain ()
@@ -4954,7 +4954,7 @@ def periodic_points(self, n, minimal=True, formal=False, R=None, algorithm='vari
49544954 for k in ZZ (n ).divisors ():
49554955 if ZZ (n // k ).is_prime ():
49564956 Sn .append (k )
4957- if isinstance (R , (PolynomialRing_general ,
4957+ if isinstance (R , (PolynomialRing_generic ,
49584958 MPolynomialRing_base )):
49594959 phi = FlatteningMorphism (CR )
49604960 flatCR = phi .codomain ()
@@ -5789,7 +5789,7 @@ def sigma_invariants(self, n, formal=False, embedding=None, type='point',
57895789 F = base_ring
57905790 if isinstance (base_ring , FractionField_generic ):
57915791 if isinstance (base_ring .ring (), (MPolynomialRing_base ,
5792- PolynomialRing_general )):
5792+ PolynomialRing_generic )):
57935793 f .normalize_coordinates ()
57945794 f_ring = f .change_ring (base_ring .ring ())
57955795 X = f_ring .periodic_points (n , minimal = False , formal = formal , return_scheme = True )
@@ -5892,7 +5892,7 @@ def sigma_invariants(self, n, formal=False, embedding=None, type='point',
58925892 base_ring = dom .base_ring ()
58935893 if isinstance (base_ring , FractionField_generic ):
58945894 base_ring = base_ring .ring ()
5895- if isinstance (base_ring , (PolynomialRing_general ,
5895+ if isinstance (base_ring , (PolynomialRing_generic ,
58965896 MPolynomialRing_base )):
58975897 base_ring = base_ring .base_ring ()
58985898 elif base_ring in FunctionFields ():
0 commit comments