git grep -l 'libs[.]all import' | xargs sed -i.bak '/[Gg]ap/s/from sa…

…ge.libs.all import/from sage.libs.gap.libgap import/'

src/sage/combinat/root_system/weyl_group.py

@@ -242,7 +242,7 @@ def __init__(self, domain, prefix):
         # FinitelyGeneratedMatrixGroup_gap takes plain matrices as input
         gens_matrix = [self.morphism_matrix(self.domain().simple_reflection(i))
                        for i in self.index_set()]
-        from sage.libs.all import libgap
+        from sage.libs.gap.libgap import libgap
         libgap_group = libgap.Group(gens_matrix)
         degree = ZZ(self.domain().dimension())
         ring = self.domain().base_ring()
@@ -1027,7 +1027,7 @@ def __init__(self, cartan_type, prefix):
         self._index_set_inverse = {ii: i for i,ii in enumerate(cartan_type.index_set())}
         self._reflection_representation = None
         self._prefix = prefix
-        #from sage.libs.all import libgap
+        #from sage.libs.gap.libgap import libgap
         Q = cartan_type.root_system().root_lattice()
         Phi = list(Q.positive_roots()) + [-x for x in Q.positive_roots()]
         p = [[Phi.index(x.weyl_action([i]))+1 for x in Phi]

src/sage/groups/matrix_gps/pickling_overrides.py

@@ -34,7 +34,7 @@ def __setstate__(self, state):
         matrix_gens = state['_gensG']
         ring = state['_MatrixGroup_gap__R']
         degree = state['_MatrixGroup_gap__n']
-        from sage.libs.all import libgap
+        from sage.libs.gap.libgap import libgap
         libgap_group = libgap.Group(libgap(matrix_gens))
         self.__init__(degree, ring, libgap_group)
 

src/sage/libs/gap/test.py

@@ -2,7 +2,7 @@
 Short tests for GAP
 """
 
-from sage.libs.all import libgap
+from sage.libs.gap.libgap import libgap
 from sage.misc.temporary_file import tmp_filename
 
 

src/sage/libs/gap/test_long.py

@@ -4,7 +4,7 @@
 These stress test the garbage collection inside GAP
 """
 
-from sage.libs.all import libgap
+from sage.libs.gap.libgap import libgap
 
 
 def test_loop_1():