Skip to content

Commit 3f8871d

Browse files
committed
remove some old deprecation warnings
1 parent 04232a4 commit 3f8871d

File tree

4 files changed

+3
-104
lines changed

4 files changed

+3
-104
lines changed

src/sage/schemes/elliptic_curves/ell_curve_isogeny.py

Lines changed: 1 addition & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,7 @@ def _isogeny_determine_algorithm(E, kernel):
171171

172172
raise ValueError("invalid parameters to EllipticCurveIsogeny constructor")
173173

174-
from sage.misc.superseded import deprecated_function_alias
175-
isogeny_determine_algorithm = deprecated_function_alias(33619, _isogeny_determine_algorithm)
176-
177-
def isogeny_codomain_from_kernel(E, kernel, degree=None):
174+
def isogeny_codomain_from_kernel(E, kernel):
178175
r"""
179176
Compute the isogeny codomain given a kernel.
180177
@@ -214,23 +211,7 @@ def isogeny_codomain_from_kernel(E, kernel, degree=None):
214211
sage: isogeny_codomain_from_kernel(E, kernel_list) # optional - sage.rings.finite_rings
215212
Elliptic Curve defined by y^2 + x*y + 3*y = x^3 + 2*x^2 + 3*x + 15
216213
over Finite Field of size 19
217-
218-
TESTS:
219-
220-
Test deprecation warning for obsolete argument::
221-
222-
sage: isogeny_codomain_from_kernel(E, kernel_list, degree=4) # optional - sage.rings.finite_rings
223-
doctest:warning
224-
...
225-
DeprecationWarning: The "degree" argument to isogeny_codomain_from_kernel() does nothing and will be removed.
226-
...
227-
Elliptic Curve defined by y^2 + x*y + 3*y = x^3 + 2*x^2 + 3*x + 15
228-
over Finite Field of size 19
229214
"""
230-
if degree is not None:
231-
from sage.misc.superseded import deprecation
232-
deprecation(33619, 'The "degree" argument to isogeny_codomain_from_kernel() does nothing and will be removed.')
233-
234215
algorithm = _isogeny_determine_algorithm(E, kernel)
235216

236217
if algorithm == 'velu':
@@ -3435,46 +3416,6 @@ def compute_isogeny_stark(E1, E2, ell):
34353416
from sage.misc.superseded import deprecated_function_alias
34363417
compute_isogeny_starks = deprecated_function_alias(34871, compute_isogeny_stark)
34373418

3438-
def split_kernel_polynomial(poly):
3439-
r"""
3440-
Obsolete internal helper function formerly used by
3441-
:func:`compute_isogeny_kernel_polynomial`.
3442-
3443-
Use
3444-
:meth:`~sage.rings.polynomial.polynomial_element.Polynomial.radical`
3445-
instead.
3446-
3447-
INPUT:
3448-
3449-
- ``poly`` -- a nonzero univariate polynomial
3450-
3451-
OUTPUT:
3452-
3453-
The maximum separable divisor of ``poly``. If the input is a full
3454-
kernel polynomial where the roots which are `x`-coordinates of
3455-
points of order greater than 2 have multiplicity 1, the output
3456-
will be a polynomial with the same roots, all of multiplicity 1.
3457-
3458-
EXAMPLES:
3459-
3460-
Check that this behaves identically to ``.radical()``::
3461-
3462-
sage: from sage.schemes.elliptic_curves.ell_curve_isogeny import split_kernel_polynomial
3463-
sage: q = next_prime(randrange(3,10^3)) # optional - sage.rings.finite_rings
3464-
sage: e = randrange(1,5) # optional - sage.rings.finite_rings
3465-
sage: R = GF(q^e,'a')['x'] # optional - sage.rings.finite_rings
3466-
sage: f = R.random_element(randrange(10,100)).monic() # optional - sage.rings.finite_rings
3467-
sage: split_kernel_polynomial(f) == f.radical() # optional - sage.rings.finite_rings
3468-
doctest:warning ...
3469-
DeprecationWarning: ...
3470-
True
3471-
"""
3472-
from sage.misc.superseded import deprecation
3473-
deprecation(33619, 'The split_kernel_polynomial() function is obsolete. '
3474-
'Use .radical() instead.')
3475-
from sage.misc.misc_c import prod
3476-
return prod([p for p,e in poly.squarefree_decomposition()])
3477-
34783419
def compute_isogeny_kernel_polynomial(E1, E2, ell, algorithm="stark"):
34793420
r"""
34803421
Return the kernel polynomial of an isogeny of degree ``ell``

src/sage/schemes/elliptic_curves/ell_field.py

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,7 +1257,7 @@ def isogeny(self, kernel, codomain=None, degree=None, model=None, check=True, al
12571257
except AttributeError as e:
12581258
raise RuntimeError("Unable to construct isogeny: %s" % e)
12591259

1260-
def isogeny_codomain(self, kernel, degree=None):
1260+
def isogeny_codomain(self, kernel):
12611261
r"""
12621262
Return the codomain of the isogeny from ``self`` with given kernel.
12631263
@@ -1288,21 +1288,7 @@ def isogeny_codomain(self, kernel, degree=None):
12881288
sage: E2 = E.isogeny_codomain(E.lift_x(77347718128277853096420969229987528666)) # optional - sage.rings.finite_rings
12891289
sage: E2._order # optional - sage.rings.finite_rings
12901290
170141183460469231746191640949390434666
1291-
1292-
Test deprecation warning for obsolete argument::
1293-
1294-
sage: E.isogeny_codomain(E.lift_x(77347718128277853096420969229987528666), degree=11) # optional - sage.rings.finite_rings
1295-
doctest:warning
1296-
...
1297-
DeprecationWarning: The "degree" argument to .isogeny_codomain() does nothing and will be removed.
1298-
...
1299-
Elliptic Curve defined by y^2 + x*y + 3*y = x^3 + 2*x^2 + 20731788786372791581385345584850817122*x + 125200507378516567345719286707201096361
1300-
over Finite Field of size 170141183460469231731687303715884105727
13011291
"""
1302-
if degree is not None:
1303-
from sage.misc.superseded import deprecation
1304-
deprecation(33619, 'The "degree" argument to .isogeny_codomain() does nothing and will be removed.')
1305-
13061292
E = isogeny_codomain_from_kernel(self, kernel)
13071293
if self.base_field().is_finite():
13081294
E._fetch_cached_order(self)

src/sage/schemes/elliptic_curves/ell_point.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3656,7 +3656,7 @@ def _acted_upon_(self, other, side):
36563656

36573657
return Q
36583658

3659-
def discrete_log(self, Q, ord=None):
3659+
def discrete_log(self, Q):
36603660
r"""
36613661
Return the discrete logarithm of `Q` to base `P` = ``self``,
36623662
that is, an integer `x` such that `xP = Q`.
@@ -3725,18 +3725,7 @@ def discrete_log(self, Q, ord=None):
37253725
sage: x = P.discrete_log(Q) # optional - sage.rings.finite_rings
37263726
sage: x*P == Q # optional - sage.rings.finite_rings
37273727
True
3728-
3729-
Doctest deprecation::
3730-
3731-
sage: P.discrete_log(Q, ord=P.order()) # optional - sage.rings.finite_rings
3732-
doctest:warning
3733-
...
3734-
DeprecationWarning: The "ord" argument to .discrete_log() is obsolete. ...
37353728
"""
3736-
if ord is not None:
3737-
from sage.misc.superseded import deprecation
3738-
deprecation(33121, 'The "ord" argument to .discrete_log() is obsolete. Use the .set_order() method instead.')
3739-
self.set_order(ord)
37403729
if Q not in self.parent():
37413730
raise ValueError('not a point on the same curve')
37423731
n = self.order()

src/sage/schemes/elliptic_curves/hom_composite.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -903,20 +903,3 @@ def is_injective(self):
903903
True
904904
"""
905905
return all(phi.is_injective() for phi in self._phis)
906-
907-
@staticmethod
908-
def make_default():
909-
r"""
910-
This method does nothing and will be removed.
911-
912-
(It is a leftover from the time when :class:`EllipticCurveHom_composite`
913-
wasn't the default yet.)
914-
915-
EXAMPLES::
916-
917-
sage: from sage.schemes.elliptic_curves.hom_composite import EllipticCurveHom_composite
918-
sage: EllipticCurveHom_composite.make_default()
919-
doctest:warning ...
920-
"""
921-
from sage.misc.superseded import deprecation
922-
deprecation(34410, 'calling EllipticCurveHom_composite.make_default() is no longer necessary')

0 commit comments

Comments
 (0)