Skip to content

changed inherited Axes calls to super #8486

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Apr 19, 2017
Merged

changed inherited Axes calls to super #8486

merged 1 commit into from
Apr 19, 2017

Conversation

jrmlhermitte
Copy link
Contributor

@jrmlhermitte jrmlhermitte commented Apr 14, 2017 •
edited
Loading

Changed Axes bound method calls using super.
Just one command:
vim regexp:

%s;Axes\.\(.*\)(self, ;super(Axes3D, self).\1(;g
followed by:
%s;Axes.\(.\)(self *;super(Axes3D, self).\1(;g

This came form #8455 . Did not have time to test, waiting for Travis.

PR Summary

PR Checklist

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

@jrmlhermitte
Copy link
Contributor Author

oops Regexp was incorrect, modified and force pushed new branch with corrected version.

anntzer
anntzer reviewed Apr 14, 2017
View reviewed changes
lib/mpl_toolkits/mplot3d/axes3d.py Outdated
@@ -95,11 +95,11 @@ def __init__(self, fig, rect=None, *args, **kwargs):
self._shared_z_axes.join(self, sharez)
self._adjustable = 'datalim'

Axes.__init__(self, fig, rect,
super(Axes3D, self).__init__(fig, rect,
Copy link
Contributor

Choose a reason for hiding this comment

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

fix indent

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks!

@jrmlhermitte
Copy link
Contributor Author

Any idea why Travis is failing in python 2.7?

>                % err)

E           ImageComparisonFailure: images not close (RMS 0.104):

E           	result_images/test_mplot3d/mixedsubplot_svg.png

E           	result_images/test_mplot3d/mixedsubplot-expected_svg.png

@jrmlhermitte
Copy link
Contributor Author

@OceanWolf I forgot to ping you on this

@tacaswell
Copy link
Member

The mixed subplot test is know to be flaky, but we have not tracked down why yet.

I suspect this conflicts with your other PR that just got merged.

tacaswell
tacaswell approved these changes Apr 16, 2017
View reviewed changes
Copy link
Member

@tacaswell tacaswell left a comment

Choose a reason for hiding this comment

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

modulo a rebase to fix conflicts.

@jrmlhermitte jrmlhermitte changed the title changed to super. regexp : :%s;Axes\..*(self;super(Axes3D, self);g changed inherited Axes calls to super Apr 17, 2017
@jrmlhermitte
Copy link
Contributor Author

jrmlhermitte commented Apr 17, 2017 •
edited
Loading

yeah, that's right (moved cla() earlier on). rebased (and changed the long title...)
Hopefully Travis won't complain.
thanks!

QuLogic
QuLogic reviewed Apr 17, 2017
View reviewed changes
Copy link
Member

@QuLogic QuLogic left a comment

Choose a reason for hiding this comment

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

Are you able rebase and squash some of these commits together? Also, somehow, your commits' author and committer information don't seem to be in sync.

lib/mpl_toolkits/mplot3d/axes3d.py Outdated

def _get_axis_list(self):
return super(Axes3D, self)._get_axis_list() + (self.zaxis, )


Copy link
Member

Choose a reason for hiding this comment

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

Extra line.

@jrmlhermitte
Copy link
Contributor Author

squashed. but author is a different email. i'll have to do that a little later.

@jrmlhermitte
replaced super.
370bdb4 
vim regexp :
%s;Axes..*(self, *;super(Axes3D, self).;g
followed by %s;Axes.\(.*\)(self *;super(Axes3D, self).\1(;g
and some typo fixes
removed extra line
@jrmlhermitte
Copy link
Contributor Author

fixed. On one machine I was working on, I had an old email as author. Thanks for catching this subtle but important detail @QuLogic

@tacaswell tacaswell added this to the 2.1 (next point release) milestone Apr 17, 2017
@jrmlhermitte
Copy link
Contributor Author

Travis failed on py3.6. Do you know if this is a flakey test?

@jenshnielsen
Copy link
Member

Yes that test measures performance and can fail do to travis workload

@phobson phobson merged commit 791b281 into matplotlib:master Apr 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@QuLogic QuLogic QuLogic left review comments

@anntzer anntzer anntzer left review comments

@tacaswell tacaswell tacaswell approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.1
Development

Successfully merging this pull request may close these issues.
6 participants
@jrmlhermitte @tacaswell @jenshnielsen @QuLogic @anntzer @phobson