sage.{categories,matrix,structure}: Replace imports from sage.*.all for namespace packages

[mkoeppe]

Using ./sage -fiximports from #34945.

Also remove trailing whitespace in the affected files.

Part of Meta-ticket #34201

CC: @alexchandler100 @tscrim @fchapoton

Component: refactoring

Author: Alex Chandler, Matthias Koeppe

Issue created by migration from https://trac.sagemath.org/ticket/34949

[mkoeppe]

Branch: u/mkoeppe/sage__categories_matrix_structure___replace_imports_from_sage___all_for_namespace_packages

[mkoeppe]

New commits:

a14d662	sage -fiximports src/sage/{categories,matrix,structure}
9911481	src/sage/{categories,matrix,structure}: Manual fixes to imports

[mkoeppe]

Commit: 9911481

[mkoeppe]

comment:3

[sagelib-9.8.beta7]     Error compiling Cython file:
[sagelib-9.8.beta7]     ------------------------------------------------------------
[sagelib-9.8.beta7]     ...
[sagelib-9.8.beta7]             if not isinstance(right, Element):
[sagelib-9.8.beta7]                 right = py_scalar_to_element(right)
[sagelib-9.8.beta7]                 if not isinstance(right, Element):
[sagelib-9.8.beta7]                     right = right.sage()
[sagelib-9.8.beta7]             from sage.arith.misc import GCD as gcd
[sagelib-9.8.beta7]                 from sage.arith.misc import GCD as gcd
[sagelib-9.8.beta7]     ^
[sagelib-9.8.beta7]     ------------------------------------------------------------
[sagelib-9.8.beta7] 
[sagelib-9.8.beta7]     sage/structure/element.pyx:4057:0: Possible inconsistent indentation
[sagelib-9.8.beta7] 
[sagelib-9.8.beta7]     Error compiling Cython file:
[sagelib-9.8.beta7]     ------------------------------------------------------------
[sagelib-9.8.beta7]     ...
[sagelib-9.8.beta7]             if not isinstance(right, Element):
[sagelib-9.8.beta7]                 right = py_scalar_to_element(right)
[sagelib-9.8.beta7]                 if not isinstance(right, Element):
[sagelib-9.8.beta7]                     right = right.sage()
[sagelib-9.8.beta7]             from sage.arith.misc import GCD as gcd
[sagelib-9.8.beta7]                 from sage.arith.misc import GCD as gcd
[sagelib-9.8.beta7]     ^
[sagelib-9.8.beta7]     ------------------------------------------------------------
[sagelib-9.8.beta7] 
[sagelib-9.8.beta7]     sage/structure/element.pyx:4057:0: Expected an identifier or literal

[jhpalmieri]

comment:5

I think these changes are to blame:

diff --git a/src/sage/structure/element.pyx b/src/sage/structure/element.pyx
index e9430f0..92e83bd 100644
--- a/src/sage/structure/element.pyx
+++ b/src/sage/structure/element.pyx
@@ -4047,8 +4053,8 @@ cdef class PrincipalIdealDomainElement(DedekindDomainElement):
             right = py_scalar_to_element(right)
             if not isinstance(right, Element):
                 right = right.sage()
-        if not ((<Element>right)._parent is self._parent):
-            from sage.arith.all import gcd
+        from sage.arith.misc import GCD as gcd
+            from sage.arith.misc import GCD as gcd
             return coercion_model.bin_op(self, right, gcd)
         return self._gcd(right)
 
@@ -4081,8 +4087,8 @@ cdef class PrincipalIdealDomainElement(DedekindDomainElement):
             right = py_scalar_to_element(right)
             if not isinstance(right, Element):
                 right = right.sage()
-        if not ((<Element>right)._parent is self._parent):
-            from sage.arith.all import lcm
+        from sage.arith.functions import lcm
+            from sage.arith.functions import lcm
             return coercion_model.bin_op(self, right, lcm)
         return self._lcm(right)

[sagetrac-git]

Branch pushed to git repo; I updated commit sha1. New commits:

01cded9

src/sage/structure/element.pyx: Fix up

[sagetrac-git]

Changed commit from 9911481 to 01cded9

[mkoeppe]

comment:8

Thanks, fixed.

[sagetrac-git]

Branch pushed to git repo; I updated commit sha1. New commits:

6203202

sage.matrix: Consolidate imports from the same module

[sagetrac-git]

Changed commit from 01cded9 to 6203202

[mkoeppe]

Changed author from Alex Chandler to Alex Chandler, Matthias Koeppe

[mkoeppe]

The branch is now on PR #35012