src/sage/schemes/hyperelliptic_curves: Use sage.rings.abc.pAdicField

src/sage/schemes/hyperelliptic_curves/constructor.py

@@ -24,7 +24,6 @@
 from .hyperelliptic_padic_field import HyperellipticCurve_padic_field
 from .hyperelliptic_g2 import HyperellipticCurve_g2
 
-from sage.rings.padics.all import is_pAdicField
 from sage.rings.rational_field import is_RationalField
 from sage.rings.finite_rings.finite_field_constructor import is_FiniteField
 from sage.rings.polynomial.polynomial_element import is_Polynomial
@@ -251,6 +250,8 @@ def HyperellipticCurve(f, h=0, names=None, PP=None, check_squarefree=True):
     genus_classes = {
         2 :  HyperellipticCurve_g2}
 
+    is_pAdicField = lambda x: isinstance(x, sage.rings.abc.pAdicField)
+
     fields = [
         ("FiniteField", is_FiniteField, HyperellipticCurve_finite_field),
         ("RationalField", is_RationalField, HyperellipticCurve_rational_field),

src/sage/schemes/hyperelliptic_curves/hyperelliptic_rational_field.py

@@ -7,7 +7,9 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-from sage.rings.padics.all import is_pAdicField, is_pAdicRing, pAdicField
+import sage.rings.abc
+
+from sage.rings.padics.all import pAdicField
 
 from sage.schemes.curves.projective_curve import ProjectivePlaneCurve_field
 
@@ -28,7 +30,7 @@ def my_chage_ring(self, R):
             return HyperellipticCurve(f.change_ring(R), h, "%s,%s"%(x,y))
 
         import sage.schemes.hyperelliptic_curves.monsky_washnitzer as monsky_washnitzer
-        if is_pAdicField(p) or is_pAdicRing(p):
+        if isinstance(p, (sage.rings.abc.pAdicField, sage.rings.abc.pAdicRing)):
             K = p
         else:
             K = pAdicField(p, prec)