Skip to content

Commit a9dacbe

Browse files
author
Matthias Koeppe
committed
is_NumberFieldElement: Deprecate, replace uses by isinstance
1 parent 7b02fb2 commit a9dacbe

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

src/sage/rings/finite_rings/residue_field.pyx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,8 @@ from sage.rings.finite_rings.finite_field_ntl_gf2e import FiniteField_ntl_gf2e
160160
from sage.rings.finite_rings.finite_field_prime_modn import FiniteField_prime_modn
161161
from sage.rings.finite_rings.finite_field_pari_ffelt import FiniteField_pari_ffelt
162162
from sage.rings.ideal import is_Ideal
163-
from sage.structure.element cimport Element
163+
from sage.structure.element cimport Element, NumberFieldElement
164164

165-
from sage.rings.number_field.number_field_element import is_NumberFieldElement
166165
from sage.rings.number_field.number_field_ideal import is_NumberFieldIdeal
167166

168167
from sage.modules.free_module_element import FreeModuleElement
@@ -295,7 +294,7 @@ class ResidueFieldFactory(UniqueFactory):
295294
if not is_Ideal(p):
296295
if isinstance(p, (int, Integer, Rational)):
297296
p = ZZ.ideal(p)
298-
elif is_NumberFieldElement(p):
297+
elif isinstance(p, NumberFieldElement):
299298
if p.parent().is_field():
300299
p = p.parent().ring_of_integers().ideal(p)
301300
else:

src/sage/rings/number_field/number_field_element.pyx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@ def is_NumberFieldElement(x):
113113
sage: is_NumberFieldElement(a+1)
114114
True
115115
"""
116+
from sage.misc.superseded import deprecation
117+
deprecation(34931,
118+
'is_NumberFieldElement is deprecated; '
119+
'use isinstance(..., sage.structure.element.NumberFieldElement) instead')
116120
return isinstance(x, NumberFieldElement)
117121

118122

@@ -3855,7 +3859,7 @@ cdef class NumberFieldElement(NumberFieldElement_base):
38553859
"""
38563860
from .number_field_ideal import is_NumberFieldIdeal
38573861
if not is_NumberFieldIdeal(P):
3858-
if is_NumberFieldElement(P):
3862+
if isinstance(P, NumberFieldElement):
38593863
P = self.number_field().fractional_ideal(P)
38603864
else:
38613865
raise TypeError("P must be an ideal")

src/sage/schemes/elliptic_curves/heegner.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
from sage.misc.verbose import verbose
9898
from sage.misc.cachefunc import cached_method
9999

100+
from sage.structure.element import NumberFieldElement
100101
from sage.structure.sage_object import SageObject
101102
from sage.structure.richcmp import (richcmp_method, richcmp,
102103
richcmp_not_equal, rich_to_bool)
@@ -2679,7 +2680,7 @@ def __init__(self, N, D, c=ZZ(1), f=None, check=True):
26792680
elif isinstance(f, BinaryQF):
26802681
# convert from BinaryQF
26812682
f = tuple(f)
2682-
elif sage.rings.number_field.number_field_element.is_NumberFieldElement(f):
2683+
elif isinstance(f, NumberFieldElement):
26832684
# tau = number field element
26842685
g = f.minpoly()
26852686
if g.degree() != 2:

0 commit comments

Comments
 (0)