Skip to content

Commit 65770e4

Browse files
author
Release Manager
committed
gh-38207: Rename PolynomialRing_general to PolynomialRing_generic Class names should be *_generic, and indeed is the case for at least 140 classes, but PolynomialRing is incorrectly suffixed with _general. This PR fixes this problem. ### 📝 Checklist - [X] The title is concise and informative. - [X] The description explains in detail what this PR is about. - [X] I have linked a relevant issue or discussion. - [X] I have created tests covering the changes. - [X] I have updated the documentation and checked the documentation preview. URL: #38207 Reported by: grhkm21 Reviewer(s): grhkm21, Kwankyu Lee, Martin Rubey, Matthias Köppe, Travis Scrimshaw
2 parents 921b135 + b0d2419 commit 65770e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+160
-155
lines changed

src/sage/algebras/weyl_algebra.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from sage.categories.algebras_with_basis import AlgebrasWithBasis
3030
from sage.sets.family import Family
3131
import sage.data_structures.blas_dict as blas
32-
from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
32+
from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
3333
from sage.rings.polynomial.multi_polynomial_ring_base import MPolynomialRing_base
3434
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
3535
from sage.structure.global_options import GlobalOptions
@@ -677,7 +677,7 @@ def __classcall__(cls, R, names=None):
677677
sage: W1 is W2
678678
True
679679
"""
680-
if isinstance(R, (PolynomialRing_general, MPolynomialRing_base)):
680+
if isinstance(R, (PolynomialRing_generic, MPolynomialRing_base)):
681681
if names is None:
682682
names = R.variable_names()
683683
R = R.base_ring()

src/sage/categories/drinfeld_modules.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from sage.rings.integer import Integer
3030

3131
lazy_import('sage.rings.polynomial.ore_polynomial_ring', 'OrePolynomialRing')
32-
lazy_import('sage.rings.polynomial.polynomial_ring', 'PolynomialRing_general')
32+
lazy_import('sage.rings.polynomial.polynomial_ring', 'PolynomialRing_generic')
3333
lazy_import('sage.rings.ring_extension', 'RingExtension_generic')
3434

3535

@@ -251,7 +251,7 @@ def __init__(self, base_field, name='t'):
251251
self._function_ring = base_morphism.domain()
252252
# Check domain of base morphism is Fq[T]
253253
function_ring = self._function_ring
254-
if not isinstance(function_ring, PolynomialRing_general):
254+
if not isinstance(function_ring, PolynomialRing_generic):
255255
raise NotImplementedError('function ring must be a polynomial '
256256
'ring')
257257
function_ring_base = function_ring.base_ring()

src/sage/crypto/lattice.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# http://www.gnu.org/licenses/
2323
#*****************************************************************************
2424

25-
from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
25+
from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
2626

2727

2828
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,
253253

254254
P = quotient.parent()
255255
# P should be a univariate polynomial ring over ZZ_q
256-
if not isinstance(P, PolynomialRing_general):
256+
if not isinstance(P, PolynomialRing_generic):
257257
raise TypeError("quotient should be a univariate polynomial")
258258
assert P.base_ring() is ZZ_q
259259

src/sage/dynamics/arithmetic_dynamics/projective_ds.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class initialization directly.
9595
from sage.rings.morphism import RingHomomorphism_im_gens
9696
from sage.rings.polynomial.multi_polynomial_ring_base import MPolynomialRing_base
9797
from 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
9999
from sage.rings.quotient_ring import QuotientRing_generic
100100
from sage.rings.rational_field import QQ
101101
from 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():

src/sage/ext/fast_callable.pyx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -475,10 +475,11 @@ def fast_callable(x, domain=None, vars=None,
475475
x = x.function(*vars)
476476

477477
if vars is None:
478-
from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
478+
from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
479479
from sage.rings.polynomial.multi_polynomial_ring import MPolynomialRing_base
480-
if isinstance(x.parent(), PolynomialRing_general) or isinstance(x.parent(), MPolynomialRing_base):
481-
vars = x.parent().variable_names()
480+
P = x.parent()
481+
if isinstance(P, (PolynomialRing_generic, MPolynomialRing_base)):
482+
vars = P.variable_names()
482483
else:
483484
# constant
484485
vars = ()

src/sage/interfaces/singular.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1785,7 +1785,7 @@ def sage_poly(self, R=None, kcache=None):
17851785
# TODO: Refactor imports to move this to the top
17861786
from sage.rings.polynomial.multi_polynomial_ring import MPolynomialRing_polydict
17871787
from sage.rings.polynomial.multi_polynomial_libsingular import MPolynomialRing_libsingular
1788-
from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
1788+
from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
17891789
from sage.rings.polynomial.polydict import ETuple
17901790
from sage.rings.polynomial.polynomial_singular_interface import can_convert_to_singular
17911791
from sage.rings.quotient_ring import QuotientRing_generic
@@ -1876,7 +1876,7 @@ def sage_poly(self, R=None, kcache=None):
18761876

18771877
return R(sage_repr)
18781878

1879-
elif isinstance(R, PolynomialRing_general) and (ring_is_fine or can_convert_to_singular(R)):
1879+
elif isinstance(R, PolynomialRing_generic) and (ring_is_fine or can_convert_to_singular(R)):
18801880

18811881
sage_repr = [0] * int(self.deg() + 1)
18821882

src/sage/matrix/matrix_space.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ def get_matrix_class(R, nrows, ncols, sparse, implementation):
297297
except ImportError:
298298
pass
299299
else:
300-
if isinstance(R, polynomial_ring.PolynomialRing_general) and R.base_ring() in _Fields:
300+
if isinstance(R, polynomial_ring.PolynomialRing_generic) and R.base_ring() in _Fields:
301301
try:
302302
from . import matrix_polynomial_dense
303303
except ImportError:

src/sage/modular/drinfeld_modform/ring.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
from sage.rings.fraction_field import FractionField_generic
3737
from sage.rings.polynomial.ore_polynomial_ring import OrePolynomialRing
3838
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
39-
from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
39+
from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
4040
from sage.rings.polynomial.term_order import TermOrder
4141
from sage.rings.integer_ring import ZZ
4242

@@ -265,7 +265,7 @@ def __classcall_private__(cls, base_ring, rank=None, group=None,
265265
if not isinstance(base_ring, FractionField_generic):
266266
raise TypeError("base ring must be a fraction field of a "
267267
"polynomial ring")
268-
if not isinstance(base_ring.base(), PolynomialRing_general):
268+
if not isinstance(base_ring.base(), PolynomialRing_generic):
269269
raise NotImplementedError("Drinfeld modular forms are currently "
270270
"only implemented for A = Fq[T]")
271271
if not base_ring.characteristic():

src/sage/modular/modform_hecketriangle/abstract_space.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from sage.rings.integer import Integer
2424
from sage.rings.integer_ring import ZZ
2525
from sage.rings.laurent_series_ring import LaurentSeriesRing
26-
from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
26+
from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
2727
from sage.rings.power_series_ring import PowerSeriesRing_generic
2828
from sage.rings.rational_field import QQ
2929
from sage.structure.element import parent
@@ -1707,7 +1707,7 @@ def construct_form(self, laurent_series, order_1=ZZ.zero(), check=True, rational
17071707
"""
17081708

17091709
base_ring = laurent_series.base_ring()
1710-
if isinstance(base_ring.base(), PolynomialRing_general):
1710+
if isinstance(base_ring.base(), PolynomialRing_generic):
17111711
if not (self.coeff_ring().has_coerce_map_from(base_ring)):
17121712
raise ValueError("The Laurent coefficients don't coerce into the coefficient ring of self!")
17131713
elif rationalize:
@@ -2001,7 +2001,7 @@ def construct_quasi_form(self, laurent_series, order_1=ZZ.zero(), check=True, ra
20012001
"""
20022002

20032003
base_ring = laurent_series.base_ring()
2004-
if isinstance(base_ring.base(), PolynomialRing_general):
2004+
if isinstance(base_ring.base(), PolynomialRing_generic):
20052005
if not (self.coeff_ring().has_coerce_map_from(base_ring)):
20062006
raise ValueError("The Laurent coefficients don't coerce into the coefficient ring of self!")
20072007
elif rationalize:
@@ -2269,7 +2269,7 @@ def rationalize_series(self, laurent_series, coeff_bound=1e-10, denom_factor=ZZ(
22692269

22702270
# If the coefficients already coerce to our coefficient ring
22712271
# and are in polynomial form we simply return the Laurent series
2272-
if (isinstance(base_ring.base(), PolynomialRing_general)):
2272+
if (isinstance(base_ring.base(), PolynomialRing_generic)):
22732273
if (self.coeff_ring().has_coerce_map_from(base_ring)):
22742274
return laurent_series
22752275
else:

src/sage/modular/modform_hecketriangle/functors.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ def _get_base_ring(ring, var_name='d'):
7979
"""
8080

8181
# from sage.rings.fraction_field import FractionField_generic
82-
from sage.rings.polynomial.polynomial_ring import PolynomialRing_general
82+
from sage.rings.polynomial.polynomial_ring import PolynomialRing_generic
8383
from sage.categories.pushout import FractionField as FractionFieldFunctor
8484

8585
base_ring = ring
8686
# if (isinstance(base_ring, FractionField_generic)):
8787
# base_ring = base_ring.base()
8888
if (base_ring.construction() and base_ring.construction()[0] == FractionFieldFunctor()):
8989
base_ring = base_ring.construction()[1]
90-
if (isinstance(base_ring, PolynomialRing_general) and base_ring.ngens() == 1 and base_ring.variable_name() == var_name):
90+
if (isinstance(base_ring, PolynomialRing_generic) and base_ring.ngens() == 1 and base_ring.variable_name() == var_name):
9191
base_ring = base_ring.base()
9292
if (base_ring.construction() and base_ring.construction()[0] == FractionFieldFunctor()):
9393
base_ring = base_ring.construction()[1]

0 commit comments

Comments
 (0)