pkgs/sagemath-{flint,symbolics}: Fixups

Author: Matthias Koeppe

src/sage/rings/finite_rings/element_ntl_gf2e.pyx

@@ -274,7 +274,6 @@ cdef class Cache_ntl_gf2e(Cache_base):
         cdef FiniteField_ntl_gf2eElement x
         cdef FiniteField_ntl_gf2eElement g
         cdef Py_ssize_t i
-        from sage.libs.gap.element import GapElement_FiniteField
 
         if is_IntegerMod(e):
             e = e.lift()
@@ -334,11 +333,14 @@ cdef class Cache_ntl_gf2e(Cache_base):
             # Reduce to pari
             e = e.__pari__()
 
-        elif isinstance(e, GapElement_FiniteField):
-            return e.sage(ring=self._parent)
-
         elif isinstance(e, GapElement):
+            from sage.libs.gap.element import GapElement_FiniteField
+
+            if isinstance(e, GapElement_FiniteField):
+                return e.sage(ring=self._parent)
+
             from sage.libs.gap.libgap import libgap
+
             return libgap(e).sage(ring=self._parent)
 
         else:

src/sage/rings/number_field/number_field.py

@@ -82,7 +82,6 @@
 
 
 import sage.libs.ntl.all as ntl
-import sage.interfaces.gap
 
 import sage.rings.complex_mpfr
 from sage.rings.polynomial.polynomial_element import Polynomial
@@ -4530,7 +4529,8 @@ def _gap_init_(self):
         """
         if not self.is_absolute():
             raise NotImplementedError("Currently, only simple algebraic extensions are implemented in gap")
-        G = sage.interfaces.gap.gap
+        from sage.interfaces.gap import gap as G
+
         q = self.polynomial()
         if q.variable_name() != 'E':
             return 'CallFuncList(function() local %s,E; %s:=Indeterminate(%s,"%s"); E:=AlgebraicExtension(%s,%s,"%s"); return E; end,[])' % (q.variable_name(), q.variable_name(), G(self.base_ring()).name(), q.variable_name(), G(self.base_ring()).name(), repr(self.polynomial()), str(self.gen()))

src/sage/rings/polynomial/complex_roots.py

@@ -21,7 +21,11 @@
 
     sage: x = polygen(ZZ)
     sage: (x^5 - x - 1).roots(ring=CIF)
-    [(1.167303978261419?, 1), (-0.764884433600585? - 0.352471546031727?*I, 1), (-0.764884433600585? + 0.352471546031727?*I, 1), (0.181232444469876? - 1.083954101317711?*I, 1), (0.181232444469876? + 1.083954101317711?*I, 1)]
+    [(1.167303978261419?, 1),
+     (-0.764884433600585? - 0.352471546031727?*I, 1),
+     (-0.764884433600585? + 0.352471546031727?*I, 1),
+     (0.181232444469876? - 1.083954101317711?*I, 1),
+     (0.181232444469876? + 1.083954101317711?*I, 1)]
 """
 
 #*****************************************************************************
@@ -61,9 +65,13 @@ def interval_roots(p, rts, prec):
         sage: rts = [CC.zeta(3)^i for i in range(0, 3)]
         sage: from sage.rings.polynomial.complex_roots import interval_roots
         sage: interval_roots(p, rts, 53)
-        [1, -0.500000000000000? + 0.866025403784439?*I, -0.500000000000000? - 0.866025403784439?*I]
+        [1, -0.500000000000000? + 0.866025403784439?*I,
+            -0.500000000000000? - 0.866025403784439?*I]
         sage: interval_roots(p, rts, 200)
-        [1, -0.500000000000000000000000000000000000000000000000000000000000? + 0.866025403784438646763723170752936183471402626905190314027904?*I, -0.500000000000000000000000000000000000000000000000000000000000? - 0.866025403784438646763723170752936183471402626905190314027904?*I]
+        [1, -0.500000000000000000000000000000000000000000000000000000000000?
+              + 0.866025403784438646763723170752936183471402626905190314027904?*I,
+            -0.500000000000000000000000000000000000000000000000000000000000?
+              - 0.866025403784438646763723170752936183471402626905190314027904?*I]
     """
 
     CIF = ComplexIntervalField(prec)
@@ -172,15 +180,19 @@ def complex_roots(p, skip_squarefree=False, retval='interval', min_prec=0):
         sage: from sage.rings.polynomial.complex_roots import complex_roots
         sage: x = polygen(ZZ)
         sage: complex_roots(x^5 - x - 1)
-        [(1.167303978261419?, 1), (-0.764884433600585? - 0.352471546031727?*I, 1), (-0.764884433600585? + 0.352471546031727?*I, 1), (0.181232444469876? - 1.083954101317711?*I, 1), (0.181232444469876? + 1.083954101317711?*I, 1)]
-        sage: v=complex_roots(x^2 + 27*x + 181)
+        [(1.167303978261419?, 1),
+         (-0.764884433600585? - 0.352471546031727?*I, 1),
+         (-0.764884433600585? + 0.352471546031727?*I, 1),
+         (0.181232444469876? - 1.083954101317711?*I, 1),
+         (0.181232444469876? + 1.083954101317711?*I, 1)]
+        sage: v = complex_roots(x^2 + 27*x + 181)
 
     Unfortunately due to numerical noise there can be a small imaginary part to each
     root depending on CPU, compiler, etc, and that affects the printing order. So we
     verify the real part of each root and check that the imaginary part is small in
     both cases::
 
-        sage: v # random
+        sage: v  # random
         [(-14.61803398874990?..., 1), (-12.3819660112501...? + 0.?e-27*I, 1)]
         sage: sorted((v[0][0].real(),v[1][0].real()))
         [-14.61803398874989?, -12.3819660112501...?]
@@ -227,11 +239,16 @@ def complex_roots(p, skip_squarefree=False, retval='interval', min_prec=0):
         ....:     if tiny(x.imag()): return x.real()
         ....:     if tiny(x.real()): return CIF(0, x.imag())
         sage: rts = complex_roots(p); type(rts[0][0]), sorted(map(smash, rts))
-        (<class 'sage.rings.complex_interval.ComplexIntervalFieldElement'>, [-1.618033988749895?, -0.618033988749895?*I, 1.618033988749895?*I, 0.618033988749895?])
+        (<class 'sage.rings.complex_interval.ComplexIntervalFieldElement'>,
+         [-1.618033988749895?, -0.618033988749895?*I,
+          1.618033988749895?*I, 0.618033988749895?])
         sage: rts = complex_roots(p, retval='algebraic'); type(rts[0][0]), sorted(map(smash, rts))
-        (<class 'sage.rings.qqbar.AlgebraicNumber'>, [-1.618033988749895?, -0.618033988749895?*I, 1.618033988749895?*I, 0.618033988749895?])
+        (<class 'sage.rings.qqbar.AlgebraicNumber'>,
+         [-1.618033988749895?, -0.618033988749895?*I,
+          1.618033988749895?*I, 0.618033988749895?])
         sage: rts = complex_roots(p, retval='algebraic_real'); type(rts[0][0]), rts
-        (<class 'sage.rings.qqbar.AlgebraicReal'>, [(-1.618033988749895?, 1), (0.618033988749895?, 1)])
+        (<class 'sage.rings.qqbar.AlgebraicReal'>,
+         [(-1.618033988749895?, 1), (0.618033988749895?, 1)])
 
     TESTS: