Skip to content

Remove unnecessary null checks in macosx.m, and some more maintenance #22109

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 5, 2022

Conversation

anntzer
Copy link
Contributor

@anntzer anntzer commented Jan 5, 2022

PR Summary

  • The FigureCanvas init already errors out if self->view is NULL, and, more importanly, ObjC explicitly does allow calling methods ("sending messages") on NULL (they just return NULL/0 in that case). Ditto for FigureManager and self->window.
  • Also remove unnecessary NULLs at the end of PyObject_CallMethod calls (which are unneeded and in fact technically wrong).
  • Use NSMakeRect more; declare variables closer to initialization.

PR Checklist

Tests and Styling

  • Has pytest style unit tests (and pytest passes).
  • Is Flake 8 compliant (install flake8-docstrings and run flake8 --docstring-convention=all).

Documentation

  • New features are documented, with examples if plot related.
  • New features have an entry in doc/users/next_whats_new/ (follow instructions in README.rst there).
  • API changes documented in doc/api/next_api_changes/ (follow instructions in README.rst there).
  • Documentation is sphinx and numpydoc compliant (the docs should build without error).

The FigureCanvas init already errors out if self->view is NULL, and,
more importanly, ObjC explicitly does allow calling methods ("sending
messages") on NULL (they just return NULL/0 in that case).  Ditto for
FigureManager and self->window.

Unrelatedly, also remove unnecessary NULLs at the end of
PyObject_CallMethod calls (which are unneeded and in fact technically
wrong).
@timhoffm timhoffm added this to the v3.6.0 milestone Jan 5, 2022
Copy link
Contributor

@greglucas greglucas left a comment

Choose a reason for hiding this comment

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

You've been doing so much macosx work now that you're re-using branch names ;) When I tested this out locally it complained about me already having this name. Maybe I'll just add your fork as a remote and pull directly next time :)

I tested the rubber band to be sure as well and all is good on that.

@greglucas greglucas merged commit d5a46ba into matplotlib:main Jan 5, 2022
@anntzer anntzer deleted the macosxmaint branch January 5, 2022 23:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants