passagemath-modules 10.5.32__cp310-cp310-macosx_14_0_arm64.whl → 10.6.20__cp310-cp310-macosx_14_0_arm64.whl

sage/crypto/util.py

@@ -12,21 +12,19 @@ AUTHORS:
   ``is_blum_prime``, ``least_significant_bits``, ``random_blum_prime``.
 """
 
-#*****************************************************************************
+# ***************************************************************************
 #       Copyright (c) 2009, 2010 Minh Van Nguyen <nguyenminh2@gmail.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
-#                  http://www.gnu.org/licenses/
-#*****************************************************************************
+#                  https://www.gnu.org/licenses/
+# ***************************************************************************
 
-from sage.arith.functions import lcm
 from sage.arith.misc import is_prime, primes, random_prime
 from sage.misc.lazy_import import lazy_import
 from sage.rings.finite_rings.integer_mod import Mod as mod
-from sage.rings.integer import Integer
 
 lazy_import('sage.arith.misc', ('carmichael_lambda'), deprecation=34719)
 lazy_import('sage.monoids.string_monoid', 'BinaryStrings')
@@ -259,7 +257,7 @@ def bin_to_ascii(B):
     return "".join(A)
 
 
-def has_blum_prime(lbound, ubound):
+def has_blum_prime(lbound, ubound) -> bool:
     r"""
     Determine whether or not there is a Blum prime within the specified closed
     interval.

sage/ext/interpreters/__init__.py

@@ -1 +1 @@
-# Automatically generated by /private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/build-env-y9u5bbi3/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
+# Automatically generated by /private/var/folders/y6/nj790rtn62lfktb1sh__79hc0000gn/T/build-env-dhl06n4x/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!

sage/ext/interpreters/all__sagemath_modules.py

@@ -1,2 +1,2 @@
 # sage_setup: distribution = sagemath-modules
-# Automatically generated by /private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/build-env-y9u5bbi3/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
+# Automatically generated by /private/var/folders/y6/nj790rtn62lfktb1sh__79hc0000gn/T/build-env-dhl06n4x/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!

sage/ext/interpreters/wrapper_cc.pxd

@@ -1,15 +1,15 @@
 # sage_setup: distribution = sagemath-modules
-# Automatically generated by /private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/build-env-y9u5bbi3/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
-
-from cpython.ref cimport PyObject
-
-from sage.ext.fast_callable cimport Wrapper
+# Automatically generated by /private/var/folders/y6/nj790rtn62lfktb1sh__79hc0000gn/T/build-env-dhl06n4x/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
 
 from sage.rings.real_mpfr cimport RealNumber
 from sage.libs.mpfr cimport *
 from sage.rings.complex_mpfr cimport ComplexNumber
 from sage.libs.mpc cimport *
 
+from cpython.ref cimport PyObject
+
+from sage.ext.fast_callable cimport Wrapper
+
 cdef class Wrapper_cc(Wrapper):
     cdef object domain
     cdef ComplexNumber domain_element

sage/ext/interpreters/wrapper_cc.pyx

@@ -1,5 +1,5 @@
 # sage_setup: distribution = sagemath-modules
-# Automatically generated by /private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/build-env-y9u5bbi3/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
+# Automatically generated by /private/var/folders/y6/nj790rtn62lfktb1sh__79hc0000gn/T/build-env-dhl06n4x/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
 # distutils: libraries = mpfr mpc gmp
 
 cdef public bint cc_py_call_helper(object domain, object fn,

sage/ext/interpreters/wrapper_cdf.pxd

@@ -1,16 +1,14 @@
 # sage_setup: distribution = sagemath-modules
-# Automatically generated by /private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/build-env-y9u5bbi3/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
+# Automatically generated by /private/var/folders/y6/nj790rtn62lfktb1sh__79hc0000gn/T/build-env-dhl06n4x/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
+
+# distutils: language = c++
+cimport libcpp.complex
+ctypedef libcpp.complex.complex[double] double_complex
 
 from cpython.ref cimport PyObject
 
 from sage.ext.fast_callable cimport Wrapper
 
-# We need the type double_complex to work around
-#   http://trac.cython.org/ticket/869
-# so this is a bit hackish.
-cdef extern from "complex.h":
-    ctypedef double double_complex "double complex"
-
 cdef class Wrapper_cdf(Wrapper):
     cdef int _n_args
     cdef double_complex* _args

sage/ext/interpreters/wrapper_cdf.pyx

@@ -1,22 +1,17 @@
 # sage_setup: distribution = sagemath-modules
-# Automatically generated by /private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/build-env-y9u5bbi3/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
+# Automatically generated by /private/var/folders/y6/nj790rtn62lfktb1sh__79hc0000gn/T/build-env-dhl06n4x/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
 from sage.libs.gsl.complex cimport *
 from sage.rings.complex_double cimport ComplexDoubleElement
 import sage.rings.complex_double
 cdef object CDF = sage.rings.complex_double.CDF
 
-cdef extern from "complex.h":
-    cdef double creal(double_complex)
-    cdef double cimag(double_complex)
-    cdef double_complex _Complex_I
-
 cdef inline double_complex CDE_to_dz(zz) noexcept:
     cdef ComplexDoubleElement z = <ComplexDoubleElement>(zz if isinstance(zz, ComplexDoubleElement) else CDF(zz))
-    return GSL_REAL(z._complex) + _Complex_I * GSL_IMAG(z._complex)
+    return double_complex(GSL_REAL(z._complex), GSL_IMAG(z._complex))
 
 cdef inline ComplexDoubleElement dz_to_CDE(double_complex dz):
     cdef ComplexDoubleElement z = <ComplexDoubleElement>ComplexDoubleElement.__new__(ComplexDoubleElement)
-    GSL_SET_COMPLEX(&z._complex, creal(dz), cimag(dz))
+    GSL_SET_COMPLEX(&z._complex, dz.real(), dz.imag())
     return z
 
 cdef public bint cdf_py_call_helper(object fn,
@@ -36,7 +31,6 @@ cdef public bint cdf_py_call_helper(object fn,
     return 1
 
 
-
 from cpython.ref cimport PyObject
 cdef extern from "Python.h":
     void Py_DECREF(PyObject *o)
@@ -59,7 +53,7 @@ cdef extern from "interp_cdf.c":
         double_complex* constants,
         PyObject** py_constants,
         double_complex* stack,
-        int* code) except? -1094648119105371
+        int* code) except *
 
 cdef class Wrapper_cdf(Wrapper):
     # attributes are declared in corresponding .pxd file

sage/ext/interpreters/wrapper_rdf.pxd

@@ -1,5 +1,5 @@
 # sage_setup: distribution = sagemath-modules
-# Automatically generated by /private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/build-env-y9u5bbi3/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
+# Automatically generated by /private/var/folders/y6/nj790rtn62lfktb1sh__79hc0000gn/T/build-env-dhl06n4x/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
 
 from cpython.ref cimport PyObject
 

sage/ext/interpreters/wrapper_rdf.pyx

@@ -1,5 +1,5 @@
 # sage_setup: distribution = sagemath-modules
-# Automatically generated by /private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/build-env-y9u5bbi3/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
+# Automatically generated by /private/var/folders/y6/nj790rtn62lfktb1sh__79hc0000gn/T/build-env-dhl06n4x/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
 cimport sage.libs.gsl.math  # Add dependency on GSL
 
 from cpython.ref cimport PyObject

sage/ext/interpreters/wrapper_rr.pxd

@@ -1,14 +1,14 @@
 # sage_setup: distribution = sagemath-modules
-# Automatically generated by /private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/build-env-y9u5bbi3/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
-
-from cpython.ref cimport PyObject
-
-from sage.ext.fast_callable cimport Wrapper
+# Automatically generated by /private/var/folders/y6/nj790rtn62lfktb1sh__79hc0000gn/T/build-env-dhl06n4x/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
 
 from sage.rings.real_mpfr cimport RealField_class, RealNumber
 from sage.libs.mpfr cimport *
 
 
+from cpython.ref cimport PyObject
+
+from sage.ext.fast_callable cimport Wrapper
+
 cdef class Wrapper_rr(Wrapper):
     cdef RealField_class domain
     cdef int _n_args

sage/ext/interpreters/wrapper_rr.pyx

@@ -1,5 +1,5 @@
 # sage_setup: distribution = sagemath-modules
-# Automatically generated by /private/var/folders/w5/_8wgjw3j5cg6mgrth3s2kg9m0000gn/T/build-env-y9u5bbi3/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
+# Automatically generated by /private/var/folders/y6/nj790rtn62lfktb1sh__79hc0000gn/T/build-env-dhl06n4x/lib/python3.10/site-packages/sage_setup/autogen/interpreters/internal/generator.py.  Do not edit!
 cdef public bint rr_py_call_helper(object domain, object fn,
                                    int n_args,
                                    mpfr_t* args, mpfr_t retval) except 0:
@@ -15,7 +15,6 @@ cdef public bint rr_py_call_helper(object domain, object fn,
     return 1
 
 
-
 from cpython.ref cimport PyObject
 cdef extern from "Python.h":
     void Py_DECREF(PyObject *o)

sage/geometry/toric_lattice.py

@@ -1057,7 +1057,7 @@ class ToricLattice_ambient(ToricLattice_generic, FreeModule_ambient_pid):
         EXAMPLES::
 
             sage: N = ToricLattice(3)
-            sage: N.plot()                                                              # needs sage.plot
+            sage: N.plot()                                                              # needs sage.geometry.polyhedron sage.plot
             Graphics3d Object
         """
         if "show_lattice" not in options:
@@ -1188,12 +1188,12 @@ class ToricLattice_sublattice_with_basis(ToricLattice_generic,
 
             sage: N = ToricLattice(3)
             sage: sublattice = N.submodule_with_basis([(1,1,0), (3,2,1)])
-            sage: sublattice.plot()                                                     # needs sage.plot
+            sage: sublattice.plot()                                                     # needs sage.geometry.polyhedron sage.plot
             Graphics3d Object
 
         Now we plot both the ambient lattice and its sublattice::
 
-            sage: N.plot() + sublattice.plot(point_color='red')                         # needs sage.plot
+            sage: N.plot() + sublattice.plot(point_color='red')                         # needs sage.geometry.polyhedron sage.plot
             Graphics3d Object
         """
         if "show_lattice" not in options:

sage/groups/additive_abelian/additive_abelian_group.py

@@ -365,7 +365,7 @@ class AdditiveAbelianGroup_class(FGP_Module_class):
 
     def is_multiplicative(self):
         r"""
-        Return False since this is an additive group.
+        Return ``False`` since this is an additive group.
 
         EXAMPLES::
 

sage/groups/additive_abelian/qmodnz.py

@@ -70,7 +70,7 @@ class QmodnZ(Parent, UniqueRepresentation):
     """
     Element = QmodnZ_Element
 
-    def __init__(self, n=1):
+    def __init__(self, n=1) -> None:
         r"""
         Initialization.
 
@@ -91,7 +91,7 @@ class QmodnZ(Parent, UniqueRepresentation):
         Parent.__init__(self, base=ZZ, category=category)
         self._populate_coercion_lists_(coerce_list=[QQ])
 
-    def _repr_(self):
+    def _repr_(self) -> str:
         r"""
         Display the group.
 
@@ -157,7 +157,7 @@ class QmodnZ(Parent, UniqueRepresentation):
         """
         return self.element_class(self, QQ(x))
 
-    def an_element(self):
+    def _an_element_(self):
         """
         Return an element, for use in coercion system.
 
@@ -168,7 +168,7 @@ class QmodnZ(Parent, UniqueRepresentation):
         """
         return self(0)
 
-    def some_elements(self):
+    def some_elements(self) -> list:
         """
         Return some elements, for use in testing.
 

sage/groups/matrix_gps/coxeter_group.py

@@ -256,7 +256,7 @@ class CoxeterMatrixGroup(UniqueRepresentation, FinitelyGeneratedMatrixGroup_gene
             sage: CoxeterGroup(['D',4], base_ring=QQ).category()
             Category of finite irreducible Coxeter groups
 
-            sage: # needs sage.rings.number_field
+            sage: # needs sage.rings.number_field sage.symbolic
             sage: CoxeterGroup(['H',4], base_ring=QQbar).category()
             Category of finite irreducible Coxeter groups
             sage: F = CoxeterGroups().Finite()
@@ -547,6 +547,18 @@ class CoxeterMatrixGroup(UniqueRepresentation, FinitelyGeneratedMatrixGroup_gene
             [-1  1]  [ 0 -1]  [ 1  0]
             [ 0  1], [-1  0], [ 1 -1]
             ]
+
+        TESTS::
+
+            sage: W = CoxeterGroup(CoxeterType(['A', 2]).relabel({1: 'r', 2: 's'}))
+            sage: F = W._positive_roots_reflections()
+            sage: F.keys()
+            [(1, 0), (1, 1), (0, 1)]
+            sage: list(F)
+            [
+            [-1  1]  [ 0 -1]  [ 1  0]
+            [ 0  1], [-1  0], [ 1 -1]
+            ]
         """
         if not self.is_finite():
             raise NotImplementedError('not available for infinite groups')
@@ -558,13 +570,14 @@ class CoxeterMatrixGroup(UniqueRepresentation, FinitelyGeneratedMatrixGroup_gene
         simple_roots = FreeModule(self.base_ring(), self.ngens()).gens()
 
         refls = self.simple_reflections()
+        refls_index = {refl_i[1]: refl_i[0] for refl_i in enumerate(refls.keys())}
         resu = []
         d = {}
         for i in range(1, N + 1):
             segment = word[:i]
             last = segment.pop()
             ref = refls[last]
-            rt = simple_roots[last - 1]
+            rt = simple_roots[refls_index[last]]
             while segment:
                 last = segment.pop()
                 cr = refls[last]
@@ -722,7 +735,7 @@ class CoxeterMatrixGroup(UniqueRepresentation, FinitelyGeneratedMatrixGroup_gene
         def first_descent(self, side='right', index_set=None, positive=False):
             """
             Return the first left (resp. right) descent of ``self``, as
-            ane element of ``index_set``, or ``None`` if there is none.
+            an element of ``index_set``, or ``None`` if there is none.
 
             See :meth:`descents` for a description of the options.
 
@@ -798,7 +811,7 @@ class CoxeterMatrixGroup(UniqueRepresentation, FinitelyGeneratedMatrixGroup_gene
                 return [I[i] for i in index_set if not _matrix_test_right_descent(M, i, n, zero)]
             return [I[i] for i in index_set if _matrix_test_right_descent(M, i, n, zero)]
 
-        def has_right_descent(self, i):
+        def has_right_descent(self, i) -> bool:
             r"""
             Return whether ``i`` is a right descent of ``self``.
 

sage/groups/misc_gps/argument_groups.py

@@ -778,7 +778,7 @@ class UnitCircleGroup(AbstractArgumentGroup):
                 raise ValueError('{} is not in {}'.format(data, self))
 
         elif not isinstance(data, int) or data != 0:
-            raise ValueError('input is ambigous: '
+            raise ValueError('input is ambiguous: '
                              '{} as well as exponent={} '
                              'specified'.format(data, exponent))
 
@@ -1835,7 +1835,7 @@ class ArgumentGroupFactory(UniqueFactory):
                  domain is not None,
                  exponents is not None)):
             raise ValueError(
-                'input ambigous: ' +
+                'input ambiguous: ' +
                 ', '.join('{}={}'.format(s, v) for s, v in
                           [('data', data), ('specification', specification),
                            ('domain', domain), ('exponents', exponents)]

sage/groups/misc_gps/imaginary_groups.py

@@ -20,15 +20,15 @@ AUTHORS:
 Classes and Methods
 ===================
 """
-#*****************************************************************************
+# ****************************************************************************
 # Copyright (C) 2018 Daniel Krenn <dev@danielkrenn.at>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
-#                  http://www.gnu.org/licenses/
-#*****************************************************************************
+#                  https://www.gnu.org/licenses/
+# ****************************************************************************
 
 from sage.structure.element import AdditiveGroupElement
 from sage.structure.parent import Parent
@@ -472,7 +472,7 @@ class ImaginaryGroup(UniqueRepresentation, Parent):
                 raise ValueError('{} is not in {}'.format(data, self))
 
         elif not isinstance(data, int) or data != 0:
-            raise ValueError('input is ambigous: '
+            raise ValueError('input is ambiguous: '
                              '{} as well as imag={} '
                              'specified'.format(data, imag))
 

sage/homology/chain_complex.py

@@ -55,13 +55,11 @@ from sage.structure.element import ModuleElement, Vector, coercion_model
 from sage.misc.cachefunc import cached_method
 
 from sage.rings.integer_ring import ZZ
-from sage.rings.rational_field import QQ
 from sage.modules.free_module import FreeModule
 from sage.modules.free_module_element import vector
 from sage.matrix.matrix0 import Matrix
 from sage.matrix.constructor import matrix
 from sage.misc.latex import latex
-from sage.misc.superseded import deprecation
 from sage.rings.fast_arith import prime_range
 from sage.homology.homology_group import HomologyGroup
 from sage.misc.persist import register_unpickle_override

sage/homology/hochschild_complex.py

@@ -226,13 +226,13 @@ class HochschildComplex(UniqueRepresentation, Parent):
             sage: d1 = H.boundary(1)
             sage: x = d1.domain().an_element(); x
             2*s[] # s[] + 2*s[] # s[1] + 3*s[] # s[2]
-            sage: d1(x)                                                                 # needs lrcalc
+            sage: d1(x)                                                                 # needs lrcalc_python
             0
             sage: y = tensor([s.an_element(), s.an_element()])
-            sage: d1(y)                                                                 # needs lrcalc
+            sage: d1(y)                                                                 # needs lrcalc_python
             0
             sage: z = tensor([s[2,1] + s[3], s.an_element()])
-            sage: d1(z)                                                                 # needs lrcalc
+            sage: d1(z)                                                                 # needs lrcalc_python
             0
 
         TESTS::

sage/homology/homology_morphism.py

@@ -13,15 +13,15 @@ AUTHORS:
 - John H. Palmieri (2015.09)
 """
 
-########################################################################
+# ######################################################################
 #       Copyright (C) 2015 John H. Palmieri <palmieri@math.washington.edu>
 #
 #  Distributed under the terms of the GNU General Public License (GPL)
 #  as published by the Free Software Foundation; either version 2 of
 #  the License, or (at your option) any later version.
 #
-#                  http://www.gnu.org/licenses/
-########################################################################
+#                  https://www.gnu.org/licenses/
+# ######################################################################
 
 # To do: implement morphisms of cubical complexes, with methods
 #   - domain
@@ -131,7 +131,7 @@ class InducedHomologyMorphism(Morphism):
         sage: diag_c(c)
         h^{1,0}
     """
-    def __init__(self, map, base_ring=None, cohomology=False):
+    def __init__(self, map, base_ring=None, cohomology=False) -> None:
         """
         INPUT:
 
@@ -387,7 +387,7 @@ class InducedHomologyMorphism(Morphism):
         """
         return self.to_matrix().right_nullity() == 0
 
-    def _repr_type(self):
+    def _repr_type(self) -> str:
         """
         EXAMPLES::
 
@@ -401,7 +401,7 @@ class InducedHomologyMorphism(Morphism):
         """
         return "Graded vector space" if not self._cohomology else "Graded algebra"
 
-    def _repr_defn(self):
+    def _repr_defn(self) -> str:
         """
         EXAMPLES::
 

sage/homology/homology_vector_space_with_basis.py

@@ -445,7 +445,7 @@ class HomologyVectorSpaceWithBasis(CombinatorialFreeModule):
         tester = self._tester(**options)
         dual = self.dual()
         dims = [a[0] for a in self._indices]
-        for dim in range(max(max(dims), tester._max_runs) + 1):
+        for dim in range(max(*dims, tester._max_runs) + 1):
             n = len(self.basis(dim))
             m = matrix(n, n, [a.eval(b) for a in self.basis(dim) for b in dual.basis(dim)])
             tester.assertEqual(m, 1, f"error in dimension {dim}")

sage/matrix/args.pyx

@@ -298,9 +298,12 @@ cdef class MatrixArgs:
     Test invalid input::
 
         sage: MatrixArgs(ZZ, 2, 2, entries='abcd').finalized()
+        <MatrixArgs for Full MatrixSpace of 2 by 2 dense matrices
+        over Integer Ring; typ=SCALAR; entries='abcd'>
+        sage: matrix(ZZ, 2, 2, entries='abcd')
         Traceback (most recent call last):
         ...
-        TypeError: unable to convert 'abcd' to a matrix
+        TypeError: unable to convert 'abcd' to an integer
         sage: MatrixArgs(ZZ, 2, 2, entries=MatrixArgs()).finalized()
         Traceback (most recent call last):
         ...
@@ -396,7 +399,7 @@ cdef class MatrixArgs:
         # but do not check for positional row_keys, column_keys arguments
         # -- we do not allow those, as they would be too easy to
         # confuse with entries
-        cdef int k
+        cdef Py_ssize_t k
         cdef long v
         if self.nrows == -1 and self.ncols == -1:
             for k in range(2):
@@ -1522,12 +1525,19 @@ cdef class MatrixArgs:
             [()  0  0]
             [ 0 ()  0]
             [ 0  0 ()]
+
+        Verify that :issue:`34821` is fixed::
+
+            sage: matrix(ZZ, 2, 2, "3")
+            [3 0]
+            [0 3]
         """
         # Check basic Python types. This is very fast, so it doesn't
         # hurt to do these first.
         if self.entries is None:
             return MA_ENTRIES_ZERO
-        if isinstance(self.entries, (int, float, complex, Integer)):
+        if isinstance(self.entries, (int, float, complex, Integer, str)):
+            # Note that a string is not considered to be a sequence.
             if self.entries:
                 return MA_ENTRIES_SCALAR
             return MA_ENTRIES_ZERO
@@ -1572,9 +1582,6 @@ cdef class MatrixArgs:
         if isinstance(self.entries, MatrixArgs):
             # Prevent recursion
             return MA_ENTRIES_UNKNOWN
-        if isinstance(self.entries, str):
-            # Blacklist strings, we don't want them to be considered a sequence
-            return MA_ENTRIES_UNKNOWN
         try:
             self.entries = list(self.entries)
         except TypeError:
@@ -1593,6 +1600,16 @@ cdef class MatrixArgs:
         is a sequence.
 
         If the entries are invalid, return ``MA_ENTRIES_UNKNOWN``.
+
+        TESTS:
+
+        Verify that :issue:`34821` is fixed::
+
+            sage: matrix(ZZ, 1,2, ["1", "2"])
+            [1 2]
+            sage: matrix(ZZ, 2,1, ["1", "2"])
+            [1]
+            [2]
         """
         if not self.entries:
             return MA_ENTRIES_SEQ_FLAT
@@ -1608,13 +1625,11 @@ cdef class MatrixArgs:
                 return MA_ENTRIES_SEQ_SEQ
             else:
                 return MA_ENTRIES_SEQ_FLAT
-        if isinstance(x, (int, float, complex)):
+        if isinstance(x, (int, float, complex, str)):
+            # Note that a string is not considered to be a sequence.
             return MA_ENTRIES_SEQ_FLAT
         if isinstance(x, Element) and element_is_scalar(<Element>x):
             return MA_ENTRIES_SEQ_FLAT
-        if isinstance(x, str):
-            # Blacklist strings, we don't want them to be considered a sequence
-            return MA_ENTRIES_UNKNOWN
         try:
             iter(x)
         except TypeError:

sage/matrix/benchmark.py

@@ -19,13 +19,17 @@ The basic command syntax is as follows::
     ======================================================================
 """
 
-from .constructor import random_matrix, Matrix
+import sys
+
+from sage.matrix.constructor import Matrix, random_matrix
 from sage.misc.lazy_import import lazy_import
+from sage.misc.timing import cputime
+from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
 from sage.rings.integer_ring import ZZ
 from sage.rings.rational_field import QQ
-from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
-from sage.misc.timing import cputime
-from cysignals.alarm import AlarmInterrupt, alarm, cancel_alarm
+
+if sys.platform != 'win32':
+    from cysignals.alarm import AlarmInterrupt, alarm, cancel_alarm
 
 lazy_import('sage.interfaces.magma', 'magma')
 

sage/matrix/compute_J_ideal.py

@@ -494,7 +494,7 @@ class ComputeMinimalPolynomials(SageObject):
         verbose("Generators with (p^t)-generating property:")
         verbose(generators)
 
-        heap = list((f.degree(), f) for f in generators)
+        heap = [(f.degree(), f) for f in generators]
         heapq.heapify(heap)
 
         # find poly of minimal degree
@@ -795,7 +795,7 @@ class ComputeMinimalPolynomials(SageObject):
         if s_max < t:
             result = {r: polynomial
                       for r, polynomial in p_min_polys.items() if r < s_max}
-            next_t_candidates = list(r for r in p_min_polys if r >= s_max)
+            next_t_candidates = [r for r in p_min_polys if r >= s_max]
             if next_t_candidates:
                 next_t = min(next_t_candidates)
                 result.update({s_max: p_min_polys[next_t] % p**s_max})

sage/matrix/echelon_matrix.pyx

@@ -107,7 +107,7 @@ def reduced_echelon_matrix_iterator(K, k, n, bint sparse=False, bint copy=True,
         True
     """
     cdef Matrix m0,m,mm
-    cdef int i
+    cdef Py_ssize_t i
     n = int(n)
     k = int(k)