sage -fiximports src/sage/{misc,monoids,sets}

Author: alexchandler100

src/sage/misc/cachefunc.pyx

@@ -69,7 +69,7 @@ approach is still needed for cpdef methods::
     sage: cython_code = ['cpdef test_meth(self,x):',
     ....: '    "some doc for a wrapped cython method"',
     ....: '    return -x',
-    ....: 'from sage.all import cached_method',
+    ....: 'from sage.misc.cachefunc import cached_method',
     ....: 'from sage.structure.parent cimport Parent',
     ....: 'cdef class MyClass(Parent):',
     ....: '    @cached_method',
@@ -107,7 +107,10 @@ By :trac:`11115`, even if a parent does not allow attribute
 assignment, it can inherit a cached method from the parent class of a
 category (previously, the cache would have been broken)::
 
-    sage: cython_code = ["from sage.all import cached_method, cached_in_parent_method, Category, Objects",
+    sage: cython_code = ["from sage.misc.cachefunc import cached_method", 
+    ....: "from sage.misc.cachefunc import cached_in_parent_method",
+    ....: "from sage.categories.category import Category", 
+    ....: "from sage.categories.objects import Objects",
     ....: "class MyCategory(Category):",
     ....: "    @cached_method",
     ....: "    def super_categories(self):",

src/sage/misc/fast_methods.pyx

@@ -311,7 +311,7 @@ class Singleton(WithEqualityById, metaclass=ClasscallMetaclass):
         EXAMPLES::
 
             sage: from sage.misc.fast_methods import Singleton
-            sage: class C(Singleton, Parent):                  
+            sage: class C(Singleton, Parent):
             ....:     def __init__(self):
             ....:         print("creating singleton")
             ....:         Parent.__init__(self, base=ZZ, category=Rings())
@@ -321,7 +321,7 @@ class Singleton(WithEqualityById, metaclass=ClasscallMetaclass):
             sage: __main__.C = C       # ... in doctests
             sage: loads(dumps(c)) is copy(c) is C()  # indirect doctest
             True
-        """ 
+        """
         return self
 
     def __reduce__(self):
@@ -332,7 +332,7 @@ class Singleton(WithEqualityById, metaclass=ClasscallMetaclass):
         EXAMPLES::
 
             sage: from sage.misc.fast_methods import Singleton
-            sage: class C(Singleton, Parent):                  
+            sage: class C(Singleton, Parent):
             ....:     def __init__(self):
             ....:         print("creating singleton")
             ....:         Parent.__init__(self, base=ZZ, category=Rings())
@@ -349,5 +349,5 @@ class Singleton(WithEqualityById, metaclass=ClasscallMetaclass):
         instance.If the class is replaced by a sub-sub-class after creation
         of the instance, pickling fails. See the doctest
         in :class:`Singleton`.
-        """ 
+        """
         return self.__class__, ()

src/sage/misc/functional.py

@@ -1822,7 +1822,7 @@ def squarefree_part(x):
         return x.squarefree_part()
     except AttributeError:
         pass
-    from sage.arith.all import factor
+    from sage.arith.misc import factor
     from sage.structure.all import parent
     F = factor(x)
     n = parent(x)(1)

src/sage/misc/latex.py

@@ -409,7 +409,7 @@ def float_function(x):
         sage: latex(float(2e-13))
         2 \times 10^{-13}
     """
-    from sage.all import RDF
+    from sage.rings.real_double import RDF
     return latex(RDF(x))
 
 

src/sage/misc/persist.pyx

@@ -298,7 +298,7 @@ def _base_dumps(obj, compress=True):
 
     global already_pickled
     gherkin = SagePickler.dumps(obj)
-    already_pickled = { }   
+    already_pickled = { }
 
     if compress:
         return comp.compress(gherkin)

src/sage/monoids/string_monoid.py

@@ -521,7 +521,7 @@ def __init__(self):
             sage: S([ i for i in range(26) ])
             ABCDEFGHIJKLMNOPQRSTUVWXYZ
         """
-        from sage.rings.all import RealField
+        from sage.rings.real_mpfr import RealField
         RR = RealField()
         # The characteristic frequency probability distribution of
         # Robert Edward Lewand.

src/sage/monoids/string_monoid_element.py

@@ -22,7 +22,7 @@
 
 # import operator
 from sage.rings.integer import Integer
-from sage.rings.all import RealField
+from sage.rings.real_mpfr import RealField
 from .free_monoid_element import FreeMonoidElement
 from sage.structure.richcmp import richcmp
 

src/sage/monoids/string_ops.py

@@ -8,7 +8,7 @@
 #                  http://www.gnu.org/licenses/
 #*****************************************************************************
 
-from sage.rings.all import RealField
+from sage.rings.real_mpfr import RealField
 from .string_monoid_element import StringMonoidElement
 
 def strip_encoding(S):

src/sage/sets/disjoint_set.pyx

@@ -237,7 +237,7 @@ cdef class DisjointSet_class(SageObject):
             sage: e == d
             True
         """
-        from sage.sets.all import Set
+        from sage.sets.set import Set
         s = Set(map(Set, self.root_to_elements_dict().values()))
         try:
             t = Set(map(Set, other.root_to_elements_dict().values()))

src/sage/sets/primes.py

@@ -17,7 +17,7 @@
 from sage.rings.integer_ring import ZZ
 from .set import Set_generic
 from sage.categories.infinite_enumerated_sets import InfiniteEnumeratedSets
-from sage.arith.all import nth_prime
+from sage.arith.misc import nth_prime
 from sage.structure.unique_representation import UniqueRepresentation