Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Remove Python 2 code from C extensions#10507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
anntzer merged 6 commits intomatplotlib:masterfromQuLogic:py3-c-ext
Mar 5, 2018

Conversation

QuLogic
Copy link
Member

@QuLogicQuLogic commentedFeb 17, 2018
edited
Loading

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

  • [N/A] Has Pytest style unit tests
  • Code is PEP 8 compliant
  • [N/A] New features are documented, with examples if plot related
  • [N/A] Documentation is sphinx and numpydoc compliant
  • [N/A] Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
  • [N/A] Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way

@QuLogicQuLogic added this to thev3.0 milestoneFeb 17, 2018
Copy link
Member

@tacaswelltacaswell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Have not gone over this with a fine-tooth comb, but in favor of getting this in sooner rather than later.

@QuLogicQuLogic changed the titleRemove Python 2 code from C extensionsWIP: Remove Python 2 code from C extensionsFeb 17, 2018
@QuLogic
Copy link
MemberAuthor

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.

@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

just inline the conditional stuff below?

Copy link
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

OK, will do when I next rebase.

@QuLogicQuLogic added the Py3k labelFeb 18, 2018
@efiring
Copy link
Member

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 underscoreand 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.
@QuLogicQuLogic changed the titleWIP: Remove Python 2 code from C extensionsRemove Python 2 code from C extensionsMar 5, 2018
@QuLogic
Copy link
MemberAuthor

Rebased now that everything else is merged.

@anntzeranntzer merged commit21c4f9e intomatplotlib:masterMar 5, 2018
@QuLogicQuLogic deleted the py3-c-ext branchMarch 5, 2018 08:23
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@tacaswelltacaswelltacaswell approved these changes

@anntzeranntzeranntzer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v3.0.0
Development

Successfully merging this pull request may close these issues.

4 participants
@QuLogic@efiring@tacaswell@anntzer

[8]ページ先頭

©2009-2025 Movatter.jp