Skip to content
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

Fix multiple inheritance check for generic classes #6720

Merged
merged 6 commits into from Apr 25, 2019

Conversation

@ilevkivskyi
Copy link
Collaborator

commented Apr 25, 2019

Fixes #5973

The fix is straightforward, I just copy a bit of logic (bind self and map type) from normal override check
to the multiple inheritance one (I also factored it out in a small method to avoid duplication).

Using this opportunity I also added/expanded some docstrings.

@ilevkivskyi ilevkivskyi requested review from msullivan and gvanrossum Apr 25, 2019

first = base1[name]
second = base2[name]
first = base1.names[name]
second = base2.names[name]

This comment has been minimized.

Copy link
@ilevkivskyi

ilevkivskyi Apr 25, 2019

Author Collaborator

This change is not needed, but it makes the intent of this method more evident.

@msullivan
Copy link
Collaborator

left a comment

This looks great. Thanks for adding documentation too!

Ivan Levkivskyi

@ilevkivskyi ilevkivskyi merged commit 970a1b6 into python:master Apr 25, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@ilevkivskyi ilevkivskyi deleted the ilevkivskyi:fix-multi-generic branch Apr 25, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.