Fixups

Author: Matthias Koeppe

src/sage/interfaces/gap.py

@@ -1743,7 +1743,7 @@ def intmod_gap_to_sage(x):
         sage: b.parent()
         Ring of integers modulo 65537
     """
-    from sage.rings.finite_rings.all import FiniteField
+    from sage.rings.finite_rings.finite_field_constructor import FiniteField
     from sage.rings.finite_rings.integer_mod import Mod
     from sage.rings.integer import Integer
     s = str(x)

src/sage/rings/finite_rings/finite_field_base.pyx

@@ -2119,7 +2119,7 @@ def is_FiniteField(R):
 
     EXAMPLES::
 
-        sage: from sage.rings.finite_rings.finite_field_base import FiniteField
+        sage: from sage.rings.finite_rings.finite_field_base import is_FiniteField
         sage: is_FiniteField(GF(9,'a'))
         doctest:...: DeprecationWarning: the function is_FiniteField is deprecated; use isinstance(x, sage.rings.finite_rings.finite_field_base.FiniteField) instead
         See https://trac.sagemath.org/32664 for details.

src/sage/rings/finite_rings/finite_field_ntl_gf2e.py

@@ -52,6 +52,7 @@ def late_import():
     import sage.rings.polynomial.polynomial_element
     is_Polynomial = sage.rings.polynomial.polynomial_element.is_Polynomial
 
+
 class FiniteField_ntl_gf2e(FiniteField):
     """
     Finite Field of characteristic 2 and order `2^n`.

src/sage/rings/finite_rings/hom_prime_finite_field.pyx

@@ -33,7 +33,7 @@ from .hom_finite_field cimport SectionFiniteFieldHomomorphism_generic
 from .hom_finite_field cimport FiniteFieldHomomorphism_generic
 from .hom_finite_field cimport FrobeniusEndomorphism_finite_field
 
-from sage.rings.finite_rings.finite_field_base import FiniteField, is_FiniteField
+from sage.rings.finite_rings.finite_field_base import FiniteField
 from sage.rings.morphism cimport RingHomomorphism_im_gens
 
 

src/sage/symbolic/ring.pyx

@@ -234,8 +234,8 @@ cdef class SymbolicRing(sage.rings.abc.SymbolicRing):
                                     sage.rings.abc.ComplexIntervalField,
                                     sage.rings.abc.RealBallField,
                                     sage.rings.abc.ComplexBallField,
-                                    sage.rings.abc.IntegerModRing))
-                  or isinstance(R, FiniteField)):
+                                    sage.rings.abc.IntegerModRing,
+                                    FiniteField))):
                 return True
             elif isinstance(R, GenericSymbolicSubring):
                 return True