use from six.moves.builtins, details of imports

Author: Frédéric Chapoton

src/sage/combinat/integer_vector.py

@@ -29,8 +29,8 @@
 from __future__ import print_function, absolute_import
 
 import itertools
-import misc
-from six.moves.builtin import list as builtinlist
+from . import misc
+from six.moves.builtins import list as builtinlist
 from sage.categories.enumerated_sets import EnumeratedSets
 from sage.combinat.combinat import CombinatorialClass
 from sage.rings.integer import Integer

src/sage/combinat/integer_vector_weighted.py

@@ -31,7 +31,7 @@
 from sage.structure.parent import Parent
 from sage.sets.disjoint_union_enumerated_sets import DisjointUnionEnumeratedSets
 from sage.combinat.words.word import Word
-from permutation import Permutation
+from .permutation import Permutation
 
 def WeightedIntegerVectors(n = None, weight = None):
     """

src/sage/combinat/root_system/cartan_type.py

@@ -634,7 +634,7 @@ def __call__(self, *args):
 
         if isinstance(t, str):
             if "x" in t:
-                import type_reducible
+                from . import type_reducible
                 return type_reducible.CartanType([CartanType(u) for u in t.split("x")])
             elif t[-1] == "*":
                 return CartanType(t[:-1]).dual()
@@ -650,35 +650,35 @@ def __call__(self, *args):
             if len(t) == 2:
                 if letter == "A":
                     if n >= 0:
-                        import type_A
+                        from . import type_A
                         return type_A.CartanType(n)
                 if letter == "B":
                     if n >= 1:
-                        import type_B
+                        from . import type_B
                         return type_B.CartanType(n)
                 if letter == "C":
                     if n >= 1:
-                        import type_C
+                        from . import type_C
                         return type_C.CartanType(n)
                 if letter == "D":
-                    import type_D
+                    from . import type_D
                     if n >= 2:
                         return type_D.CartanType(n)
                 if letter == "E":
                     if n >= 6 and n <= 8:
-                        import type_E
+                        from . import type_E
                         return type_E.CartanType(n)
                 if letter == "F":
                     if n == 4:
-                        import type_F
+                        from . import type_F
                         return type_F.CartanType()
                 if letter == "G":
                     if n == 2:
-                        import type_G
+                        from . import type_G
                         return type_G.CartanType()
                 if letter == "H":
                     if n in [3, 4]:
-                        import type_H
+                        from . import type_H
                         return type_H.CartanType(n)
                 if letter == "I":
                     if n == 1:
@@ -690,42 +690,42 @@ def __call__(self, *args):
                     if n == 6:
                         return CartanType(["G", 2])
                     if n >= 1:
-                        import type_I
+                        from . import type_I
                         return type_I.CartanType(n)
             if len(t) == 3:
                 if t[2] == 1: # Untwisted affine
                     if letter == "A":
                         if n >= 1:
-                            import type_A_affine
+                            from . import type_A_affine
                             return type_A_affine.CartanType(n)
                     if letter == "B":
                         if n >= 1:
-                            import type_B_affine
+                            from . import type_B_affine
                             return type_B_affine.CartanType(n)
                     if letter == "C":
                         if n >= 1:
-                            import type_C_affine
+                            from . import type_C_affine
                             return type_C_affine.CartanType(n)
                     if letter == "D":
-                        import type_D_affine
+                        from . import type_D_affine
                         if n >= 3:
                             return type_D_affine.CartanType(n)
                     if letter == "E":
                         if n >= 6 and n <= 8:
-                            import type_E_affine
+                            from . import type_E_affine
                             return type_E_affine.CartanType(n)
                     if letter == "F":
                         if n == 4:
-                            import type_F_affine
+                            from . import type_F_affine
                             return type_F_affine.CartanType()
                     if letter == "G":
                         if n == 2:
-                            import type_G_affine
+                            from . import type_G_affine
                             return type_G_affine.CartanType()
                 if t[2] in [2,3]:
                     if letter == "BC" and t[2] == 2:
                         if n >= 1:
-                            import type_BC_affine
+                            from . import type_BC_affine
                             return type_BC_affine.CartanType(n)
                     if letter == "A" and t[2] == 2:
                         if n%2 == 0: # Kac' A_2n^(2)
@@ -739,7 +739,7 @@ def __call__(self, *args):
                     if letter == "E" and t[2] == 2 and n == 6:
                         return CartanType(["F", 4, 1]).dual()
             raise ValueError("%s is not a valid Cartan type"%t)
-        import type_reducible
+        from . import type_reducible
         return type_reducible.CartanType([ CartanType(subtype) for subtype in t ])
 
     global_options = CartanTypeOptions
@@ -1128,7 +1128,7 @@ def dual(self):
             sage: CartanType(['F',4]).dual()
             ['F', 4] relabelled by {1: 4, 2: 3, 3: 2, 4: 1}
         """
-        import type_dual
+        from . import type_dual
         return type_dual.CartanType(self)
 
     def relabel(self, relabelling):
@@ -1153,7 +1153,7 @@ def relabel(self, relabelling):
            4   3   2   1
            F4 relabelled by {1: 4, 2: 3, 3: 2, 4: 1}
         """
-        import type_relabel
+        from . import type_relabel
         return type_relabel.CartanType(self, relabelling)
 
     def subtype(self, index_set):
@@ -1192,7 +1192,7 @@ def marked_nodes(self, marked_nodes):
         """
         if not marked_nodes:
             return self
-        import type_marked
+        from . import type_marked
         return type_marked.CartanType(self, marked_nodes)
 
     def is_reducible(self):
@@ -2403,7 +2403,7 @@ def __reduce__(self):
             True
 
         """
-        from cartan_type import CartanType
+        from .cartan_type import CartanType
         return (CartanType, (self.letter, self.n))
 
     def __cmp__(self, other):

src/sage/structure/global_options.py

@@ -371,7 +371,7 @@ def _ge_option_b(self, other):
 #*****************************************************************************
 from __future__ import absolute_import
 
-from six.moves.builtin import str
+from six.moves.builtins import str
 from sage.structure.sage_object import SageObject