Rename PolynomialRing_general to PolynomialRing_generic

src/sage/algebras/weyl_algebra.py

@@ -29,7 +29,7 @@
 from sage.categories.algebras_with_basis import AlgebrasWithBasis
 from sage.sets.family import Family
 import sage.data_structures.blas_dict as blas
-from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
+from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
 from sage.rings.polynomial.multi_polynomial_ring_base import MPolynomialRing_base
 from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
 from sage.structure.global_options import GlobalOptions
@@ -677,7 +677,7 @@ def __classcall__(cls, R, names=None):
             sage: W1 is W2
             True
         """
-        if isinstance(R, (PolynomialRing_general, MPolynomialRing_base)):
+        if isinstance(R, (PolynomialRing_generic, MPolynomialRing_base)):
             if names is None:
                 names = R.variable_names()
                 R = R.base_ring()

src/sage/categories/drinfeld_modules.py

@@ -29,7 +29,7 @@
 from sage.rings.integer import Integer
 
 lazy_import('sage.rings.polynomial.ore_polynomial_ring', 'OrePolynomialRing')
-lazy_import('sage.rings.polynomial.polynomial_ring', 'PolynomialRing_general')
+lazy_import('sage.rings.polynomial.polynomial_ring', 'PolynomialRing_generic')
 lazy_import('sage.rings.ring_extension', 'RingExtension_generic')
 
 
@@ -251,7 +251,7 @@ def __init__(self, base_field, name='t'):
         self._function_ring = base_morphism.domain()
         # Check domain of base morphism is Fq[T]
         function_ring = self._function_ring
-        if not isinstance(function_ring, PolynomialRing_general):
+        if not isinstance(function_ring, PolynomialRing_generic):
             raise NotImplementedError('function ring must be a polynomial '
                                       'ring')
         function_ring_base = function_ring.base_ring()

src/sage/crypto/lattice.py

@@ -22,7 +22,7 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
+from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
 
 
 def gen_lattice(type='modular', n=4, m=8, q=11, seed=None,
@@ -253,7 +253,7 @@ def gen_lattice(type='modular', n=4, m=8, q=11, seed=None,
 
         P = quotient.parent()
         # P should be a univariate polynomial ring over ZZ_q
-        if not isinstance(P, PolynomialRing_general):
+        if not isinstance(P, PolynomialRing_generic):
             raise TypeError("quotient should be a univariate polynomial")
         assert P.base_ring() is ZZ_q
 

src/sage/dynamics/arithmetic_dynamics/projective_ds.py

@@ -95,7 +95,7 @@ class initialization directly.
 from sage.rings.morphism import RingHomomorphism_im_gens
 from sage.rings.polynomial.multi_polynomial_ring_base import MPolynomialRing_base
 from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
-from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
+from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
 from sage.rings.quotient_ring import QuotientRing_generic
 from sage.rings.rational_field import QQ
 from sage.rings.real_mpfr import RealField
@@ -385,7 +385,7 @@ def __classcall_private__(cls, morphism_or_polys, domain=None, names=None):
             polys = list(morphism_or_polys)
             if len(polys) == 1:
                 raise ValueError("list/tuple must have at least 2 polynomials")
-            test = lambda x: isinstance(x, (PolynomialRing_general, MPolynomialRing_base))
+            test = lambda x: isinstance(x, (PolynomialRing_generic, MPolynomialRing_base))
             if not all(test(poly.parent()) for poly in polys):
                 try:
                     polys = [poly.lift() for poly in polys]
@@ -395,7 +395,7 @@ def __classcall_private__(cls, morphism_or_polys, domain=None, names=None):
             # homogenize!
             f = morphism_or_polys
             aff_CR = f.parent()
-            if (not isinstance(aff_CR, PolynomialRing_general) and not isinstance(aff_CR, FractionField_generic)
+            if (not isinstance(aff_CR, (PolynomialRing_generic, FractionField_generic))
                 and not (isinstance(aff_CR, MPolynomialRing_base) and aff_CR.ngens() == 1)):
                 msg = '{} is not a single variable polynomial or rational function'
                 raise ValueError(msg.format(f))
@@ -3533,7 +3533,7 @@ def affine_preperiodic_model(self, m, n, return_conjugation=False):
                         if hyperplane_found:
                             break
                 else:
-                    if isinstance(R, (PolynomialRing_general,
+                    if isinstance(R, (PolynomialRing_generic,
                                       MPolynomialRing_base,
                                       FractionField_generic)):
                         # for polynomial rings, we can get an infinite family of hyperplanes
@@ -4597,7 +4597,7 @@ def preperiodic_points(self, m, n, **kwds):
                     for k in ZZ(n).divisors():
                         if ZZ(n/k).is_prime():
                             Sn.append(k)
-                    if isinstance(R, (PolynomialRing_general,
+                    if isinstance(R, (PolynomialRing_generic,
                                       MPolynomialRing_base)):
                         phi = FlatteningMorphism(CR)
                         flatCR = phi.codomain()
@@ -4954,7 +4954,7 @@ def periodic_points(self, n, minimal=True, formal=False, R=None, algorithm='vari
                         for k in ZZ(n).divisors():
                             if ZZ(n//k).is_prime():
                                 Sn.append(k)
-                        if isinstance(R, (PolynomialRing_general,
+                        if isinstance(R, (PolynomialRing_generic,
                                           MPolynomialRing_base)):
                             phi = FlatteningMorphism(CR)
                             flatCR = phi.codomain()
@@ -5789,7 +5789,7 @@ def sigma_invariants(self, n, formal=False, embedding=None, type='point',
                     F = base_ring
                     if isinstance(base_ring, FractionField_generic):
                         if isinstance(base_ring.ring(), (MPolynomialRing_base,
-                                                         PolynomialRing_general)):
+                                                         PolynomialRing_generic)):
                             f.normalize_coordinates()
                             f_ring = f.change_ring(base_ring.ring())
                             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',
         base_ring = dom.base_ring()
         if isinstance(base_ring, FractionField_generic):
             base_ring = base_ring.ring()
-        if isinstance(base_ring, (PolynomialRing_general,
+        if isinstance(base_ring, (PolynomialRing_generic,
                                   MPolynomialRing_base)):
             base_ring = base_ring.base_ring()
         elif base_ring in FunctionFields():

src/sage/ext/fast_callable.pyx

@@ -475,10 +475,11 @@ def fast_callable(x, domain=None, vars=None,
             x = x.function(*vars)
 
         if vars is None:
-            from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
+            from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
             from sage.rings.polynomial.multi_polynomial_ring import MPolynomialRing_base
-            if isinstance(x.parent(), PolynomialRing_general) or isinstance(x.parent(), MPolynomialRing_base):
-                vars = x.parent().variable_names()
+            P = x.parent()
+            if isinstance(P, (PolynomialRing_generic, MPolynomialRing_base)):
+                vars = P.variable_names()
             else:
                 # constant
                 vars = ()

src/sage/interfaces/singular.py

@@ -1785,7 +1785,7 @@ def sage_poly(self, R=None, kcache=None):
         # TODO: Refactor imports to move this to the top
         from sage.rings.polynomial.multi_polynomial_ring import MPolynomialRing_polydict
         from sage.rings.polynomial.multi_polynomial_libsingular import MPolynomialRing_libsingular
-        from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
+        from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
         from sage.rings.polynomial.polydict import ETuple
         from sage.rings.polynomial.polynomial_singular_interface import can_convert_to_singular
         from sage.rings.quotient_ring import QuotientRing_generic
@@ -1876,7 +1876,7 @@ def sage_poly(self, R=None, kcache=None):
 
             return R(sage_repr)
 
-        elif isinstance(R, PolynomialRing_general) and (ring_is_fine or can_convert_to_singular(R)):
+        elif isinstance(R, PolynomialRing_generic) and (ring_is_fine or can_convert_to_singular(R)):
 
             sage_repr = [0] * int(self.deg() + 1)
 

src/sage/matrix/matrix_space.py

@@ -297,7 +297,7 @@ def get_matrix_class(R, nrows, ncols, sparse, implementation):
             except ImportError:
                 pass
             else:
-                if isinstance(R, polynomial_ring.PolynomialRing_general) and R.base_ring() in _Fields:
+                if isinstance(R, polynomial_ring.PolynomialRing_generic) and R.base_ring() in _Fields:
                     try:
                         from . import matrix_polynomial_dense
                     except ImportError:

src/sage/modular/drinfeld_modform/ring.py

@@ -36,7 +36,7 @@
 from sage.rings.fraction_field import FractionField_generic
 from sage.rings.polynomial.ore_polynomial_ring import OrePolynomialRing
 from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
-from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
+from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
 from sage.rings.polynomial.term_order import TermOrder
 from sage.rings.integer_ring import ZZ
 
@@ -265,7 +265,7 @@ def __classcall_private__(cls, base_ring, rank=None, group=None,
         if not isinstance(base_ring, FractionField_generic):
             raise TypeError("base ring must be a fraction field of a "
                             "polynomial ring")
-        if not isinstance(base_ring.base(), PolynomialRing_general):
+        if not isinstance(base_ring.base(), PolynomialRing_generic):
             raise NotImplementedError("Drinfeld modular forms are currently "
                                       "only implemented for A = Fq[T]")
         if not base_ring.characteristic():

src/sage/modular/modform_hecketriangle/abstract_space.py

@@ -23,7 +23,7 @@
 from sage.rings.integer import Integer
 from sage.rings.integer_ring import ZZ
 from sage.rings.laurent_series_ring import LaurentSeriesRing
-from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
+from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
 from sage.rings.power_series_ring import PowerSeriesRing_generic
 from sage.rings.rational_field import QQ
 from sage.structure.element import parent
@@ -1707,7 +1707,7 @@ def construct_form(self, laurent_series, order_1=ZZ.zero(), check=True, rational
         """
 
         base_ring = laurent_series.base_ring()
-        if isinstance(base_ring.base(), PolynomialRing_general):
+        if isinstance(base_ring.base(), PolynomialRing_generic):
             if not (self.coeff_ring().has_coerce_map_from(base_ring)):
                 raise ValueError("The Laurent coefficients don't coerce into the coefficient ring of self!")
         elif rationalize:
@@ -2001,7 +2001,7 @@ def construct_quasi_form(self, laurent_series, order_1=ZZ.zero(), check=True, ra
         """
 
         base_ring = laurent_series.base_ring()
-        if isinstance(base_ring.base(), PolynomialRing_general):
+        if isinstance(base_ring.base(), PolynomialRing_generic):
             if not (self.coeff_ring().has_coerce_map_from(base_ring)):
                 raise ValueError("The Laurent coefficients don't coerce into the coefficient ring of self!")
         elif rationalize:
@@ -2269,7 +2269,7 @@ def rationalize_series(self, laurent_series, coeff_bound=1e-10, denom_factor=ZZ(
 
         # If the coefficients already coerce to our coefficient ring
         # and are in polynomial form we simply return the Laurent series
-        if (isinstance(base_ring.base(), PolynomialRing_general)):
+        if (isinstance(base_ring.base(), PolynomialRing_generic)):
             if (self.coeff_ring().has_coerce_map_from(base_ring)):
                 return laurent_series
             else:

src/sage/modular/modform_hecketriangle/functors.py

@@ -79,15 +79,15 @@ def _get_base_ring(ring, var_name='d'):
     """
 
     # from sage.rings.fraction_field import FractionField_generic
-    from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
+    from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
     from sage.categories.pushout import FractionField as FractionFieldFunctor
 
     base_ring = ring
     # if (isinstance(base_ring, FractionField_generic)):
     #    base_ring = base_ring.base()
     if (base_ring.construction() and base_ring.construction()[0] == FractionFieldFunctor()):
         base_ring = base_ring.construction()[1]
-    if (isinstance(base_ring, PolynomialRing_general) and base_ring.ngens() == 1 and base_ring.variable_name() == var_name):
+    if (isinstance(base_ring, PolynomialRing_generic) and base_ring.ngens() == 1 and base_ring.variable_name() == var_name):
         base_ring = base_ring.base()
     if (base_ring.construction() and base_ring.construction()[0] == FractionFieldFunctor()):
         base_ring = base_ring.construction()[1]

src/sage/rings/asymptotic/asymptotic_ring.py

@@ -428,7 +428,7 @@
 
 lazy_import('sage.rings.lazy_series_ring', 'LazyPowerSeriesRing')
 lazy_import('sage.rings.polynomial.multi_polynomial_ring_base', 'MPolynomialRing_base')
-lazy_import('sage.rings.polynomial.polynomial_ring', 'PolynomialRing_general')
+lazy_import('sage.rings.polynomial.polynomial_ring', 'PolynomialRing_generic')
 lazy_import('sage.rings.power_series_ring', 'PowerSeriesRing_generic')
 lazy_import('sage.symbolic.ring', 'SymbolicRing')
 
@@ -4013,7 +4013,7 @@ def _element_constructor_(self, data, simplify=True, convert=True):
                                        (data, self)), e)
                 return sum(summands, self.zero())
 
-        elif isinstance(P, PolynomialRing_general):
+        elif isinstance(P, PolynomialRing_generic):
             p = P.gen()
             try:
                 return sum(iter(self.create_summand('exact', growth=p**i,

src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py

@@ -502,10 +502,10 @@
             sage: F.dimension()
             2
         """
-        from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
+        from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
         from sage.rings.polynomial.multi_polynomial_ring_base import MPolynomialRing_base
         R = self.denominator_ring
-        if isinstance(R, (PolynomialRing_general, MPolynomialRing_base)):
+        if isinstance(R, (PolynomialRing_generic, MPolynomialRing_base)):
             return R.ngens()
         raise NotImplementedError('only polynomial rings are supported as base')
 
@@ -1594,7 +1594,7 @@
             sage: asy # long time
             (4/3*sqrt(3)*sqrt(r)/sqrt(pi) + 47/216*sqrt(3)/(sqrt(pi)*sqrt(r)),
              1, 4/3*sqrt(3)*sqrt(r)/sqrt(pi) + 47/216*sqrt(3)/(sqrt(pi)*sqrt(r)))
             sage: F.relative_error(asy[0], alpha, [1, 2, 4, 8], asy[1]) # long time
             [((3, 3, 2), 0.9812164307, [1.515572606], [-0.54458543...]),
              ((6, 6, 4), 1.576181132, [1.992989399], [-0.26444185...]),
              ((12, 12, 8), 2.485286378, [2.712196351], [-0.091301338...]),
@@ -3165,9 +3165,9 @@
             p = numerator
             q = R(denominator)
 
-            from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
+            from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
             from sage.rings.polynomial.multi_polynomial_ring_base import MPolynomialRing_base
-            if isinstance(R, (PolynomialRing_general, MPolynomialRing_base)):
+            if isinstance(R, (PolynomialRing_generic, MPolynomialRing_base)):
                 if not R(q).is_unit():
                     # Factor denominator
                     try:
@@ -3233,11 +3233,10 @@
         from sage.rings.fraction_field import FractionField_generic
         if isinstance(P, FractionField_generic):
             B = P.base()
-            from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
+            from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
             from sage.rings.polynomial.multi_polynomial_ring_base import MPolynomialRing_base
-            if isinstance(B, (PolynomialRing_general, MPolynomialRing_base)):
-                if self.base().has_coerce_map_from(B):
-                    return True
+            if isinstance(B, (PolynomialRing_generic, MPolynomialRing_base)) and self.base().has_coerce_map_from(B):
+                return True
 
         if self.base().has_coerce_map_from(P):
             return True
@@ -3943,7 +3942,7 @@
         sage: B = function('B')(*tuple(T))
         sage: AB_derivs = {}
         sage: M = matrix([[1, 2],[2, 1]])
         sage: DD = diff_op(A, B, AB_derivs, T, M, 1, 2)  # long time (see :issue:`35207`)
         sage: sorted(DD)                                 # long time
         [(0, 0, 0), (0, 1, 0), (0, 1, 1), (0, 1, 2)]
         sage: DD[(0, 1, 2)].number_of_operands()         # long time

src/sage/rings/asymptotic/growth_group.py

@@ -1745,9 +1745,9 @@ def _initial_category_(base):
         # The following block can be removed once #19269 is fixed.
         from sage.rings.integer_ring import ZZ
         from sage.rings.rational_field import QQ
-        from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
+        from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
         if base is ZZ or base is QQ or \
-                isinstance(base, PolynomialRing_general) and \
+                isinstance(base, PolynomialRing_generic) and \
                 (base.base_ring() is ZZ or base.base_ring() is QQ):
             return Posets()
         else:
@@ -3463,7 +3463,7 @@ def _convert_(self, data):
             from sage.symbolic.ring import SR
             return self._convert_(SR(data))
 
-        from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
+        from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
         from sage.rings.polynomial.multi_polynomial_ring_base import \
             MPolynomialRing_base
         from sage.rings.power_series_ring import PowerSeriesRing_generic
@@ -3473,7 +3473,7 @@ def _convert_(self, data):
                 base, exponent = data.operands()
                 if str(base) == var:
                     return exponent
-        elif isinstance(P, (PolynomialRing_general, MPolynomialRing_base)):
+        elif isinstance(P, (PolynomialRing_generic, MPolynomialRing_base)):
             if data.is_monomial() and len(data.variables()) == 1:
                 if var == str(data.variables()[0]):
                     return data.degree()

src/sage/rings/asymptotic/misc.py

@@ -34,7 +34,7 @@
 lazy_import('sage.rings.lazy_series_ring', 'LazyPowerSeriesRing')
 lazy_import('sage.rings.multi_power_series_ring', 'MPowerSeriesRing_generic')
 lazy_import('sage.rings.polynomial.multi_polynomial_ring_base', 'MPolynomialRing_base')
-lazy_import('sage.rings.polynomial.polynomial_ring', 'PolynomialRing_general')
+lazy_import('sage.rings.polynomial.polynomial_ring', 'PolynomialRing_generic')
 lazy_import('sage.rings.power_series_ring', 'PowerSeriesRing_generic')
 
 
@@ -168,7 +168,7 @@ def abbreviate(P):
             pass
         raise ValueError('Cannot abbreviate %s.' % (P,))
 
-    poly = isinstance(P, (PolynomialRing_general, MPolynomialRing_base))
+    poly = isinstance(P, (PolynomialRing_generic, MPolynomialRing_base))
     power = isinstance(P, (PowerSeriesRing_generic, MPowerSeriesRing_generic, LazyPowerSeriesRing))
 
     if poly or power:

src/sage/rings/cfinite_sequence.py

@@ -95,7 +95,7 @@
 from sage.rings.integer_ring import ZZ
 from sage.rings.rational_field import QQ
 from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
-from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
+from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
 from sage.rings.laurent_series_ring import LaurentSeriesRing
 from sage.rings.power_series_ring import PowerSeriesRing
 from sage.rings.fraction_field import FractionField
@@ -142,7 +142,7 @@ def CFiniteSequences(base_ring, names=None, category=None):
 
         sage: TestSuite(C).run()
     """
-    if isinstance(base_ring, PolynomialRing_general):
+    if isinstance(base_ring, PolynomialRing_generic):
         polynomial_ring = base_ring
         base_ring = polynomial_ring.base_ring()
     if names is None: