Replace Python 2 'long' with Python 3 'int' #39091
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bca8137 to
1d1fbdf
Compare
1d1fbdf to
2b08102
Compare
mantepse
reviewed
Dec 8, 2024
src/sage/libs/mpmath/ext_main.pyx
Outdated
Comment on lines
583
to
584
| if isinstance(x, (int, Integer)) \ | ||
| or isinstance(x, rationallib.mpq): |
There was a problem hiding this comment.
Suggested change
| if isinstance(x, (int, Integer)) \ | |
| or isinstance(x, rationallib.mpq): | |
| if isinstance(x, (int, Integer, rationallib.mpq)): |
mantepse
reviewed
Dec 8, 2024
src/sage/rings/real_mpfi.pyx
Outdated
| @@ -818,7 +818,7 @@ cdef class RealIntervalField_class(sage.rings.abc.RealIntervalField): | |||
| # Direct and efficient conversions | |||
| if S is ZZ or S is QQ: | |||
| return True | |||
| if S is int or S is long: | |||
| if S is int: | |||
There was a problem hiding this comment.
you can join that with the previous conditional.
mantepse
reviewed
Dec 8, 2024
src/sage/libs/mpmath/ext_main.pyx
Outdated
Comment on lines
625
to
626
| if isinstance(x, (int, Integer)) \ | ||
| or isinstance(x, rationallib.mpq): |
There was a problem hiding this comment.
Suggested change
| if isinstance(x, (int, Integer)) \ | |
| or isinstance(x, rationallib.mpq): | |
| if isinstance(x, (int, Integer, rationallib.mpq)): |
mantepse
reviewed
Dec 8, 2024
| @@ -1358,7 +1358,7 @@ cdef class FiniteField(Field): | |||
| False | |||
| """ | |||
| from sage.rings.integer_ring import ZZ | |||
| if R is int or R is long or R is ZZ: | |||
| if R in int or R is ZZ: | |||
There was a problem hiding this comment.
Suggested change
| if R in int or R is ZZ: | |
| if R is int or R is ZZ: |
if this didn't give a failed test, it might make sense to add a doctest. Well, maybe not.
|
Documentation preview for this PR (built with commit f398a0f; changes) is ready! 🎉 |
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 9, 2024
After Cython commit cython/cython@d0f53f40f8c1 8da747919449febc2344ebb43e5f , `long` is no longer valid in `.pyx` file. ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [x] The title is concise and informative. - [x] The description explains in detail what this PR is about. - [x] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - sagemath#12345: short description why this is a dependency --> <!-- - sagemath#34567: ... --> URL: sagemath#39091 Reported by: user202729 Reviewer(s): Martin Rubey
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 11, 2024
sagemathgh-39091: Replace Python 2 'long' with Python 3 'int' After Cython commit cython/cython@d0f53f40f8c1 8da747919449febc2344ebb43e5f , `long` is no longer valid in `.pyx` file. ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [x] The title is concise and informative. - [x] The description explains in detail what this PR is about. - [x] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - sagemath#12345: short description why this is a dependency --> <!-- - sagemath#34567: ... --> URL: sagemath#39091 Reported by: user202729 Reviewer(s): Martin Rubey
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Dec 12, 2024
sagemathgh-39091: Replace Python 2 'long' with Python 3 'int' After Cython commit cython/cython@d0f53f40f8c1 8da747919449febc2344ebb43e5f , `long` is no longer valid in `.pyx` file. ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [x] The title is concise and informative. - [x] The description explains in detail what this PR is about. - [x] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - sagemath#12345: short description why this is a dependency --> <!-- - sagemath#34567: ... --> URL: sagemath#39091 Reported by: user202729 Reviewer(s): Martin Rubey
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After Cython commit cython/cython@d0f53f4 ,
longis no longer valid in.pyxfile.📝 Checklist
⌛ Dependencies