30 lines
1.5 KiB
Diff
30 lines
1.5 KiB
Diff
Minor patch so that #36403 applies cleanly over sagemath 10.1
|
|
|
|
diff --git a/src/sage/matrix/matrix2.pyx b/src/sage/matrix/matrix2.pyx
|
|
index 2053bca80c3..86aca6e00d8 100644
|
|
--- a/src/sage/matrix/matrix2.pyx
|
|
+++ b/src/sage/matrix/matrix2.pyx
|
|
@@ -15123,7 +15302,8 @@ cdef class Matrix(Matrix1):
|
|
sage: N.conjugate_transpose()
|
|
Traceback (most recent call last):
|
|
...
|
|
- AttributeError: 'sage.rings.finite_rings.integer_mod.IntegerMod_int' object has no attribute 'conjugate'
|
|
+ AttributeError: 'sage.rings.finite_rings.integer_mod.IntegerMod_int' object
|
|
+ has no attribute 'conjugate'
|
|
"""
|
|
# limited testing on a 1000 x 1000 matrix over CC:
|
|
# transpose is fast, conjugate is slow
|
|
diff --git a/src/sage/cpython/getattr.pyx b/src/sage/cpython/getattr.pyx
|
|
index 525ea5aa934..52afed49d64 100644
|
|
--- a/src/sage/cpython/getattr.pyx
|
|
+++ b/src/sage/cpython/getattr.pyx
|
|
@@ -55,7 +55,7 @@ cdef class AttributeErrorMessage:
|
|
...
|
|
AttributeError: 'sage.rings.integer.Integer' object has no attribute 'bla'
|
|
sage: x = polygen(ZZ, 'x')
|
|
- sage: QQ[x].gen().bla # optional - sage.libs.flint
|
|
+ sage: QQ[x].gen().bla # needs sage.libs.flint
|
|
Traceback (most recent call last):
|
|
...
|
|
AttributeError: 'sage.rings.polynomial.polynomial_rational_flint.Polynomial_rational_flint' object has no attribute 'bla'
|