Skip to content

Commit 524cb68

Browse files
committed
remove deprecations in quadratic forms
1 parent cb03043 commit 524cb68

File tree

2 files changed

+10
-38
lines changed

2 files changed

+10
-38
lines changed

src/sage/quadratic_forms/genera/genus.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
lazy_import('sage.interfaces.magma', 'magma')
3939

4040

41-
def genera(sig_pair, determinant, max_scale=None, even=False):
41+
def genera(sig_pair, determinant, max_scale=None, even=False) -> list:
4242
r"""
4343
Return a list of all global genera with the given conditions.
4444
@@ -51,7 +51,7 @@ def genera(sig_pair, determinant, max_scale=None, even=False):
5151
- ``determinant`` -- integer; the sign is ignored
5252
5353
- ``max_scale`` -- (default: ``None``) an integer; the maximum scale of a
54-
jordan block
54+
Jordan block
5555
5656
- ``even`` -- boolean (default: ``False``)
5757
@@ -589,7 +589,7 @@ def canonical_2_adic_compartments(genus_symbol_quintuple_list):
589589
return compartments
590590

591591

592-
def canonical_2_adic_trains(genus_symbol_quintuple_list, compartments=None):
592+
def canonical_2_adic_trains(genus_symbol_quintuple_list) -> list:
593593
r"""
594594
Given a `2`-adic local symbol (as the underlying list of quintuples)
595595
this returns a list of lists of indices of the
@@ -605,7 +605,6 @@ def canonical_2_adic_trains(genus_symbol_quintuple_list, compartments=None):
605605
606606
- ``genus_symbol_quintuple_list`` -- a quintuple of integers (with certain
607607
restrictions).
608-
- ``compartments`` -- this argument is deprecated
609608
610609
OUTPUT: list of lists of distinct integers
611610
@@ -654,10 +653,6 @@ def canonical_2_adic_trains(genus_symbol_quintuple_list, compartments=None):
654653
655654
See [CS1999]_, pp. 381-382 for definitions and examples.
656655
"""
657-
if compartments is not None:
658-
from sage.misc.superseded import deprecation
659-
deprecation(23955, "the compartments keyword has been deprecated")
660-
661656
# avoid a special case for the end of symbol
662657
# if a jordan component has rank zero it is considered even.
663658
symbol = genus_symbol_quintuple_list

src/sage/quadratic_forms/quadratic_form.py

Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from sage.matrix.matrix_space import MatrixSpace
3131
from sage.misc.functional import denominator, is_even
3232
from sage.misc.lazy_import import lazy_import
33-
from sage.misc.superseded import deprecated_function_alias, deprecation
33+
from sage.misc.superseded import deprecated_function_alias
3434
from sage.modules.free_module_element import vector
3535
from sage.quadratic_forms.quadratic_form__evaluate import (
3636
QFEvaluateMatrix,
@@ -46,29 +46,6 @@
4646
from sage.structure.sage_object import SageObject
4747

4848

49-
def is_QuadraticForm(Q):
50-
"""
51-
Determine if the object ``Q`` is an element of the :class:`QuadraticForm` class.
52-
53-
This function is deprecated.
54-
55-
EXAMPLES::
56-
57-
sage: Q = QuadraticForm(ZZ, 2, [1,2,3])
58-
sage: from sage.quadratic_forms.quadratic_form import is_QuadraticForm
59-
sage: is_QuadraticForm(Q)
60-
doctest:...: DeprecationWarning: the function is_QuadraticForm is deprecated;
61-
use isinstance(x, sage.quadratic_forms.quadratic_form.QuadraticForm) instead...
62-
True
63-
sage: is_QuadraticForm(2)
64-
False
65-
"""
66-
deprecation(35305,
67-
"the function is_QuadraticForm is deprecated; use "
68-
"isinstance(x, sage.quadratic_forms.quadratic_form.QuadraticForm) instead")
69-
return isinstance(Q, QuadraticForm)
70-
71-
7249
def quadratic_form_from_invariants(F, rk, det, P, sminus):
7350
r"""
7451
Return a rational quadratic form with given invariants.
@@ -521,7 +498,7 @@ def __init__(
521498
unsafe_initialization=False,
522499
number_of_automorphisms=None,
523500
determinant=None,
524-
):
501+
) -> None:
525502
"""
526503
EXAMPLES::
527504
@@ -721,7 +698,7 @@ def __pari__(self):
721698
"""
722699
return self.matrix().__pari__()
723700

724-
def _pari_init_(self):
701+
def _pari_init_(self) -> str:
725702
"""
726703
Return a PARI-formatted Hessian matrix for Q, as string.
727704
@@ -733,7 +710,7 @@ def _pari_init_(self):
733710
"""
734711
return self.matrix()._pari_init_()
735712

736-
def _repr_(self):
713+
def _repr_(self) -> str:
737714
"""
738715
Give a text representation for the quadratic form given as an upper-triangular matrix of coefficients.
739716
@@ -758,7 +735,7 @@ def _repr_(self):
758735
out_str += "]"
759736
return out_str
760737

761-
def _latex_(self):
738+
def _latex_(self) -> str:
762739
"""
763740
Give a LaTeX representation for the quadratic form given as an upper-triangular matrix of coefficients.
764741
@@ -847,7 +824,7 @@ def __setitem__(self, ij, coeff):
847824
except Exception:
848825
raise RuntimeError("this coefficient cannot be coerced to an element of the base ring for the quadratic form")
849826

850-
def __hash__(self):
827+
def __hash__(self) -> int:
851828
r"""
852829
TESTS::
853830
@@ -861,7 +838,7 @@ def __hash__(self):
861838
"""
862839
return hash(self.__base_ring) ^ hash(tuple(self.__coeffs))
863840

864-
def __eq__(self, right):
841+
def __eq__(self, right) -> bool:
865842
"""
866843
Determines if two quadratic forms are equal.
867844

0 commit comments

Comments
 (0)