Replace imports from sage.all

python/exterior_to_link/rational_linear_algebra.py

@@ -17,7 +17,11 @@
 from .. import sage_helper
 
 if sage_helper._within_sage and not use_pari_even_inside_sage:
-    from sage.all import QQ, RR, vector, matrix, VectorSpace
+    from sage.rings.rational_field import Q as QQ
+    from sage.rings.real_mpfr import RR
+    from sage.modules.free_module_element import free_module_element as vector
+    from sage.matrix.constructor import Matrix as matrix
+    from sage.modules.free_module import VectorSpace
 
     def rational_sqrt(x):
         """

python/exterior_to_link/rational_linear_algebra_wrapped.py

@@ -16,7 +16,10 @@
 This file is not currently used by SnapPy, but is kept for possible
 future reference.
 """
-from sage.all import QQ, vector, matrix, VectorSpace
+from sage.rings.rational_field import Q as QQ
+from sage.modules.free_module_element import free_module_element as vector
+from sage.matrix.constructor import Matrix as matrix
+from sage.modules.free_module import VectorSpace
 
 
 class Vector:

python/geometric_structure/cusp_neighborhood/complex_cusp_cross_section.py

@@ -384,7 +384,9 @@ def _add_one_cusp_vertex_positions(self, cusp : t3m.Vertex):
                     visited.add((tet1.Index, vert1))
 
     def _debug_show_horotriangles(self, cusp : int =0):
-        from sage.all import line, real, imag
+        from sage.plot.line import line
+        from sage.functions.other import real
+        from sage.functions.other import imag
 
         self.add_vertex_positions_to_horotriangles()
 
@@ -398,7 +400,9 @@ def _debug_show_horotriangles(self, cusp : int =0):
               if tet.Class[V].Index == cusp ])
 
     def _debug_show_lifted_horotriangles(self, cusp : int =0):
-        from sage.all import line, real, imag
+        from sage.plot.line import line
+        from sage.functions.other import real
+        from sage.functions.other import imag
 
         self.add_vertex_positions_to_horotriangles()
 

python/math_basics.py

@@ -21,7 +21,8 @@ def is_Interval(x):
     return is_RealIntervalFieldElement(x) or is_ComplexIntervalFieldElement(x)
 
 if _within_sage:
-    from sage.all import prod, xgcd
+    from sage.misc.misc_c import prod
+    from sage.arith.misc import XGCD as xgcd
     from sage.rings.real_mpfi import is_RealIntervalFieldElement
     from sage.rings.complex_interval import is_ComplexIntervalFieldElement
 

python/snap/character_varieties.py

@@ -359,7 +359,8 @@ def character_variety_ideal(gens, rels=None):
     2
     """
     presentation = character_variety(gens, rels)
-    from sage.all import PolynomialRing, QQ
+    from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+    from sage.rings.rational_field import Q as QQ
     R = PolynomialRing(QQ, [repr(v) for v in presentation.gens])
     return R.ideal([R(p) for p in presentation.rels])
 

python/snap/find_field.py

@@ -1,6 +1,18 @@
-from sage.all import (cached_method, real_part, imag_part, round, ceil, floor, log,
-                      ZZ, QQ, CDF, ComplexField, NumberField, PolynomialRing,
-                      matrix, identity_matrix)
+from sage.misc.cachefunc import cached_method
+from sage.functions.other import real as real_part
+from sage.functions.other import imag as imag_part
+from sage.misc.functional import round
+from sage.functions.other import ceil
+from sage.functions.other import floor
+from sage.misc.functional import log
+from sage.rings.integer_ring import Z as ZZ
+from sage.rings.rational_field import Q as QQ
+from sage.rings.complex_double import CDF
+from sage.rings.complex_mpfr import ComplexField
+from sage.rings.number_field.number_field import NumberField
+from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+from sage.matrix.constructor import Matrix as matrix
+from sage.matrix.special import identity_matrix
 import itertools
 
 

python/snap/fundamental_polyhedron.py

@@ -11,7 +11,7 @@
 
 from ..sage_helper import _within_sage
 if _within_sage:
-    from sage.all import matrix
+    from sage.matrix.constructor import Matrix as matrix
 else:
     from .utilities import Matrix2x2 as matrix
 

python/snap/nsagetools.py

@@ -6,9 +6,20 @@
 
 if _within_sage:
     import sage
-    from sage.all import (ZZ, vector, matrix, block_matrix, identity_matrix,
-                          gcd, prod, det, MatrixSpace, AbelianGroup, GroupAlgebra,
-                          SageObject, PolynomialRing, LaurentPolynomialRing)
+    from sage.rings.integer_ring import Z as ZZ
+    from sage.modules.free_module_element import free_module_element as vector
+    from sage.matrix.constructor import Matrix as matrix
+    from sage.matrix.special import block_matrix
+    from sage.matrix.special import identity_matrix
+    from sage.arith.misc import GCD as gcd
+    from sage.misc.misc_c import prod
+    from sage.misc.functional import det
+    from sage.matrix.matrix_space import MatrixSpace
+    from sage.groups.abelian_gps.abelian_group import AbelianGroup
+    from sage.algebras.group_algebra import GroupAlgebra
+    from sage.structure.sage_object import SageObject
+    from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+    from sage.rings.polynomial.laurent_polynomial_ring import LaurentPolynomialRing
 
     from .polished_reps import polished_holonomy, MatrixRepresentation
     Id2 = MatrixSpace(ZZ, 2)(1)

python/snap/peripheral/dual_cellulation.py

@@ -6,7 +6,11 @@
 from .. import t3mlite as t3m
 
 if sage_helper._within_sage:
-    from sage.all import (ZZ, matrix, vector, ChainComplex, Graph)
+    from sage.rings.integer_ring import Z as ZZ
+    from sage.matrix.constructor import Matrix as matrix
+    from sage.modules.free_module_element import free_module_element as vector
+    from sage.homology.chain_complex import ChainComplex
+    from sage.graphs.graph import Graph
 
 
 class DualCell():

python/snap/peripheral/peripheral.py

@@ -3,7 +3,9 @@
 from . import link, dual_cellulation
 
 if sage_helper._within_sage:
-    from sage.all import matrix, vector, ZZ
+    from sage.matrix.constructor import Matrix as matrix
+    from sage.modules.free_module_element import free_module_element as vector
+    from sage.rings.integer_ring import Z as ZZ
 
 
 def peripheral_curve_from_snappy(dual_cell, snappy_data):

python/snap/peripheral/surface.py

@@ -2,8 +2,14 @@
 from ... import sage_helper
 
 if sage_helper._within_sage:
-    from sage.all import (ZZ, matrix, vector, ChainComplex,
-                          cached_method, line, arrow, text)
+    from sage.rings.integer_ring import Z as ZZ
+    from sage.matrix.constructor import Matrix as matrix
+    from sage.modules.free_module_element import free_module_element as vector
+    from sage.homology.chain_complex import ChainComplex
+    from sage.misc.cachefunc import cached_method
+    from sage.plot.line import line
+    from sage.plot.arrow import arrow
+    from sage.plot.text import text
 else:
     def cached_method(func):
         return func

python/snap/polished_reps.py

@@ -11,8 +11,15 @@
 
 if _within_sage:
     import sage
-    from sage.all import RealField, ComplexField, gcd, prod, powerset
-    from sage.all import MatrixSpace, matrix, vector, ZZ
+    from sage.rings.real_mpfr import RealField
+    from sage.rings.complex_mpfr import ComplexField
+    from sage.arith.misc import GCD as gcd
+    from sage.misc.misc_c import prod
+    from sage.combinat.subset import powerset
+    from sage.matrix.matrix_space import MatrixSpace
+    from sage.matrix.constructor import Matrix as matrix
+    from sage.modules.free_module_element import free_module_element as vector
+    from sage.rings.integer_ring import Z as ZZ
     Object = sage.structure.sage_object.SageObject
     identity = lambda A: MatrixSpace(A.base_ring(), A.nrows())(1)
     abelian_group_elt = lambda v: vector(ZZ, v)

python/snap/slice_obs_HKL.py

@@ -45,10 +45,18 @@
 
 from ..sage_helper import _within_sage, sage_method
 if _within_sage:
-    from sage.all import (ZZ, PolynomialRing, LaurentPolynomialRing,
-                          GF, CyclotomicField, vector, matrix,
-                          identity_matrix, block_matrix,
-                          MatrixSpace, ChainComplex, prime_range)
+    from sage.rings.integer_ring import Z as ZZ
+    from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+    from sage.rings.polynomial.laurent_polynomial_ring import LaurentPolynomialRing
+    from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
+    from sage.rings.number_field.number_field import CyclotomicField
+    from sage.modules.free_module_element import free_module_element as vector
+    from sage.matrix.constructor import Matrix as matrix
+    from sage.matrix.special import identity_matrix
+    from sage.matrix.special import block_matrix
+    from sage.matrix.matrix_space import MatrixSpace
+    from sage.homology.chain_complex import ChainComplex
+    from sage.rings.fast_arith import prime_range
 
     from .nsagetools import (MapToFreeAbelianization, compute_torsion,
                              fox_derivative_with_involution,

python/snap/t3mlite/spun.py

@@ -10,9 +10,9 @@
 
 from ...sage_helper import _within_sage
 if _within_sage:
-    from sage.all import gcd
-    from sage.all import vector as Vector
-    from sage.all import matrix as Matrix
+    from sage.arith.misc import GCD as gcd
+    from sage.modules.free_module_element import free_module_element as Vector
+    from sage.matrix.constructor import Matrix as Matrix
 else:
     from snappy.snap.t3mlite.linalg import Vector, Matrix, gcd
 

python/snap/utilities.py

@@ -12,7 +12,8 @@
 from ..pari import pari, PariError
 from .fundamental_polyhedron import Infinity
 if _within_sage:
-    from sage.all import matrix as sage_matrix, vector as sage_vector
+    from sage.matrix.constructor import Matrix as sage_matrix
+    from sage.modules.free_module_element import free_module_element as sage_vector
     from sage.rings.real_mpfr import RealField_class
     from ..sage_helper import ComplexField_class
 

python/verify/complex_volume/adjust_torsion.py

@@ -1,6 +1,6 @@
 from ...sage_helper import _within_sage, sage_method
 if _within_sage:
-    from sage.all import pi
+    from sage.symbolic.constants import pi
     import sage.all
 
 from .extended_bloch import *

python/verify/complex_volume/closed.py

@@ -6,7 +6,8 @@
 from ...snap.t3mlite import simplex
 
 if _within_sage:
-    from sage.all import pi, xgcd
+    from sage.symbolic.constants import pi
+    from sage.arith.misc import XGCD as xgcd
     import sage.all
 
 from .. import hyperbolicity

python/verify/complex_volume/extended_bloch.py

@@ -1,9 +1,11 @@
 from ...sage_helper import _within_sage, sage_method
 
 if _within_sage:
-    from sage.all import (ComplexBallField,
-                          RealField,
-                          Integer, exp, pi)
+    from sage.rings.complex_arb import ComplexBallField
+    from sage.rings.real_mpfr import RealField
+    from sage.rings.integer import Integer
+    from sage.functions.log import exp
+    from sage.symbolic.constants import pi
 
     import sage.all
 

python/verify/hyperbolicity.py

@@ -7,7 +7,7 @@
     'verify_hyperbolicity' ]
 
 if _within_sage:
-    from sage.all import pi
+    from sage.symbolic.constants import pi
     import sage.all
 
 

python/verify/interval_tree.py

@@ -300,15 +300,15 @@ def check_find_result(self, interval):
                     self.brute_force_find(interval)))
 
     def check_consistency(self):
-        from sage.all import Infinity
+        from sage.rings.infinity import Infinity
         if self._root.isRed:
             raise Exception("Red root")
         _IntervalTreeTester._recursively_check_consistency(
             self._root, -Infinity, +Infinity)
 
     @staticmethod
     def _recursively_check_consistency(node, l, r):
-        from sage.all import Infinity
+        from sage.rings.infinity import Infinity
 
         if not node:
             return -Infinity, 0
@@ -370,7 +370,9 @@ def print_tree_recursively(node, depth):
 
     @staticmethod
     def run_test():
-        from sage.all import RIF, sin, Infinity
+        from sage.rings.real_mpfi import RIF
+        from sage.functions.trig import sin
+        from sage.rings.infinity import Infinity
 
         intervals = [
             RIF(sin(1.2 * i), sin(1.2 * i) + sin(1.43 * i) ** 2)

python/verify/krawczyk_shapes_engine.py

@@ -6,7 +6,7 @@
 if _within_sage:
     from sage.rings.complex_interval_field import ComplexIntervalField
     from sage.rings.real_mpfi import RealIntervalField
-    from sage.all import ComplexDoubleField
+    from sage.rings.complex_double import ComplexDoubleField
     from snappy.pari import prec_dec_to_bits
 
 __all__ = ['KrawczykShapesEngine']

python/verify/maximal_cusp_area_matrix/cusp_tiling_engine.py

@@ -15,7 +15,7 @@
 from .cusp_translate_engine import *
 
 if _within_sage:
-    from sage.all import matrix
+    from sage.matrix.constructor import Matrix as matrix
     import sage.all
 
 import heapq

python/verify/maximal_cusp_area_matrix/cusp_translate_engine.py

@@ -3,7 +3,8 @@
 from ..upper_halfspace.finite_point import *
 
 if _within_sage:
-    from sage.all import vector, matrix
+    from sage.modules.free_module_element import free_module_element as vector
+    from sage.matrix.constructor import Matrix as matrix
 
 __all__ = ['CuspTranslateEngine']
 

python/verify/short_slopes.py

@@ -5,7 +5,7 @@
 import math
 
 if _within_sage:
-    from sage.all import gcd
+    from sage.arith.misc import GCD as gcd
 else:
     # Python 3 has gcd in math
     from math import gcd

python/verify/upper_halfspace/extended_matrix.py

@@ -1,7 +1,7 @@
 from ...sage_helper import _within_sage
 
 if _within_sage:
-    from sage.all import sqrt
+    from sage.misc.functional import sqrt
 
 __all__ = ['ExtendedMatrix']
 

python/verify/upper_halfspace/finite_point.py

@@ -2,7 +2,8 @@
 
 if _within_sage:
     import sage.all
-    from sage.all import matrix, sqrt
+    from sage.matrix.constructor import Matrix as matrix
+    from sage.misc.functional import sqrt
     from sage.rings.real_mpfi import is_RealIntervalFieldElement
 
 from .extended_matrix import ExtendedMatrix

python/verify/upper_halfspace/ideal_point.py

@@ -18,7 +18,7 @@
 
 if _within_sage:
     import sage.all
-    from sage.all import matrix
+    from sage.matrix.constructor import Matrix as matrix
 
 from .finite_point import *
 from .extended_matrix import *
@@ -398,7 +398,9 @@ class _IdealPointTester():
     """
 
     def matrices(self):
-        from sage.all import RIF, CIF, matrix
+        from sage.rings.real_mpfi import RIF
+        from sage.rings.cif import CIF
+        from sage.matrix.constructor import Matrix as matrix
 
         return [
             matrix.identity(CIF, 2),
@@ -410,7 +412,8 @@ def matrices(self):
                  [CIF(RIF(-0.3), RIF(1.1)), CIF(1)]]) ]
 
     def run_tests(self):
-        from sage.all import RIF, CIF
+        from sage.rings.real_mpfi import RIF
+        from sage.rings.cif import CIF
 
         bias = RIF(1.5)