sage.structure, sage.misc: Replace import of sage.categories.all by more specific imports

Author: Matthias Koeppe

src/sage/categories/action.pyx

@@ -71,8 +71,8 @@ cdef inline category(x):
     try:
         return x.category()
     except AttributeError:
-        import sage.categories.all
-        return sage.categories.all.Objects()
+        from sage.categories.objects import Objects
+        return Objects()
 
 
 cdef class Action(Functor):

src/sage/misc/functional.py

@@ -127,8 +127,8 @@ def category(x):
     try:
         return x.category()
     except AttributeError:
-        import sage.categories.all
-        return sage.categories.all.Objects()
+        from sage.categories.objects import Objects
+        return Objects()
 
 
 def characteristic_polynomial(x, var='x'):

src/sage/misc/nested_class_test.py

@@ -63,7 +63,7 @@ def __init__(self):
             sage: sage.misc.nested_class_test.TestParent1()
             <sage.misc.nested_class_test.TestParent1_with_category object at ...>
         """
-        from sage.categories.all import Sets
+        from sage.categories.sets_cat import Sets
         Parent.__init__(self, category = Sets())
 
     class Element(ElementWrapper):
@@ -80,7 +80,7 @@ def __init__(self):
             ...
             TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
         """
-        from sage.categories.all import Sets
+        from sage.categories.sets_cat import Sets
         Parent.__init__(self, category = Sets())
 
     class Element(ElementWrapper):
@@ -96,7 +96,7 @@ def __init__(self):
             sage: sage.misc.nested_class_test.TestParent3()
             <sage.misc.nested_class_test.TestParent3_with_category object at ...>
         """
-        from sage.categories.all import Sets
+        from sage.categories.sets_cat import Sets
         Parent.__init__(self, category = Sets())
 
     class Element(ElementWrapper):
@@ -111,7 +111,7 @@ def __init__(self):
             sage: sage.misc.nested_class_test.TestParent4()
             <sage.misc.nested_class_test.TestParent4_with_category object at ...>
         """
-        from sage.categories.all import Sets
+        from sage.categories.sets_cat import Sets
         Parent.__init__(self, category=Sets())
 
     def __eq__(self, other):

src/sage/structure/category_object.pyx

@@ -647,7 +647,7 @@ cdef class CategoryObject(SageObject):
             return self._Hom_(codomain, cat)
         except (AttributeError, TypeError):
             pass
-        from sage.categories.all import Hom
+        from sage.categories.homset import Hom
         return Hom(self, codomain, cat)
 
     def latex_variable_names(self):

src/sage/structure/element.pyx

@@ -653,7 +653,7 @@ cdef class Element(SageObject):
         return self._parent.base_ring()
 
     def category(self):
-        from sage.categories.all import Elements
+        from sage.categories.category_types import Elements
         return Elements(self._parent)
 
     def _test_new(self, **options):

src/sage/structure/sage_object.pyx

@@ -480,7 +480,7 @@ cdef class SageObject:
     #############################################################################
 
     def category(self):
-        from sage.categories.all import Objects
+        from sage.categories.objects import Objects
         return Objects()
 
     def _test_category(self, **options):

src/sage/structure/sequence.py

@@ -232,8 +232,8 @@ def Sequence(x, universe=None, check=True, immutable=False, cr=False, cr_str=Non
         x = list(x) # make a copy even if x is a list, we're going to change it
 
         if len(x) == 0:
-            import sage.categories.all
-            universe = sage.categories.all.Objects()
+            from sage.categories.objects import Objects
+            universe = Objects()
         else:
             import sage.structure.element
             if use_sage_types:
@@ -244,8 +244,8 @@ def Sequence(x, universe=None, check=True, immutable=False, cr=False, cr_str=Non
                 try:
                     x[i], x[i+1] = sage.structure.element.canonical_coercion(x[i],x[i+1])
                 except TypeError:
-                    import sage.categories.all
-                    universe = sage.categories.all.Objects()
+                    from sage.categories.objects import Objects
+                    universe = Objects()
                     x = list(orig_x)
                     check = False  # no point
                     break