Skip to content
Prev Previous commit
Next Next commit
sage.rings, sage.schemes: Replace use of is_NumberFieldOrder
  • Loading branch information
Matthias Koeppe committed Jun 1, 2024
commit af6769fbd2b953e62beb1ddb95510dc7f2090842
7 changes: 3 additions & 4 deletions src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ from sage.rings.integer_ring import is_IntegerRing, ZZ
from sage.rings.integer cimport Integer
from sage.rings.number_field.number_field_base cimport NumberField

from sage.rings.number_field.order import is_NumberFieldOrder
from sage.categories.number_fields import NumberFields

from sage.structure.element import coerce_binop
Expand Down Expand Up @@ -5613,7 +5612,7 @@ cdef class MPolynomial_libsingular(MPolynomial_libsingular_base):
return RealField(prec).zero()

K = self.base_ring()
if K in NumberFields() or is_NumberFieldOrder(K):
if K in NumberFields() or isinstance(K, sage.rings.abc.Order) or K == ZZ:
f = self
else:
raise TypeError("Must be over a Numberfield or a Numberfield Order.")
Expand Down Expand Up @@ -5665,7 +5664,7 @@ cdef class MPolynomial_libsingular(MPolynomial_libsingular_base):
prec = 53

K = FractionField(self.base_ring())
if K not in NumberFields() or is_NumberFieldOrder(K):
if K not in NumberFields() and not isinstance(K, sage.rings.abc.Order) and K != ZZ:
raise TypeError("must be over a Numberfield or a Numberfield order")

return max([K(c).local_height(v, prec=prec) for c in self.coefficients()])
Expand Down Expand Up @@ -5709,7 +5708,7 @@ cdef class MPolynomial_libsingular(MPolynomial_libsingular_base):
1.0
"""
K = FractionField(self.base_ring())
if K not in NumberFields() or is_NumberFieldOrder(K):
if K not in NumberFields() and not isinstance(K, sage.rings.abc.Order) and K != ZZ:
return TypeError("must be over a Numberfield or a Numberfield Order")

if K == QQ:
Expand Down
4 changes: 2 additions & 2 deletions src/sage/schemes/projective/projective_point.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
_NumberFields = NumberFields()
from sage.rings.integer_ring import ZZ
from sage.rings.fraction_field import FractionField
from sage.rings.number_field.order import is_NumberFieldOrder, Order as NumberFieldOrder
from sage.rings.number_field.order import Order as NumberFieldOrder
from sage.rings.qqbar import number_field_elements_from_algebraics
from sage.rings.quotient_ring import QuotientRing_generic
from sage.rings.rational_field import QQ
Expand Down Expand Up @@ -749,7 +749,7 @@ def global_height(self, prec=None):
if prec is None:
prec = 53
K = self.codomain().base_ring()
if K in _NumberFields or is_NumberFieldOrder(K):
if K in _NumberFields or isinstance(K, NumberFieldOrder) or K == ZZ:
P = self
else:
try:
Expand Down