Remove Python 2 code from C extensions #10507
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
tacaswell
approved these changes
Feb 17, 2018
|
I'm going to mark this WIP not because it is, but just so that it doesn't accidentally get merged before the other 3. |
anntzer
reviewed
Feb 17, 2018
| @@ -326,7 +326,6 @@ int load_tkinter_funcs(void) | |||
| * tkinter uses these symbols, and the symbols are therefore visible in the | |||
| * tkinter dynamic library (module). | |||
| */ | |||
| #if PY_MAJOR_VERSION >= 3 | |||
There was a problem hiding this comment.
just inline the conditional stuff below?
There was a problem hiding this comment.
OK, will do when I next rebase.
anntzer
approved these changes
Feb 17, 2018
|
This is now waiting only on #10426, which looks ready to go after a simple merge conflict fixup. |
Anything (approximately) starting with two underscores, or an underscore and a capital letter is reserved in the C++ standard.
Python 3 always uses the new buffer protocol.
It's still not closed, but at least we can reference it later.
|
Rebased now that everything else is merged. |
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.
PR Summary
Remove a bunch of fallback code and macros that provided Python 2 compatibility in the C extensions.
Note, this is based on #7853, #10426 and #10383 because I did not want to work out the conflicts later.I'm putting this out there to prevent duplicate work later.PR Checklist