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.

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

bpo-31853: Replaced socket.method calls with super() in SSLSocket. #4048

Merged
merged 1 commit into from
Jan 27, 2018
Merged

bpo-31853: Replaced socket.method calls with super() in SSLSocket. #4048

merged 1 commit into from
Jan 27, 2018

Conversation

atombrella
Copy link
Contributor

@atombrella atombrella commented Oct 19, 2017 •
edited by bedevere-bot
Loading

@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept your contribution by verifying you have signed the PSF contributor agreement (CLA).

Unfortunately we couldn't find an account corresponding to your GitHub username on bugs.python.org (b.p.o) to verify you have signed the CLA (this might be simply due to a missing "GitHub Name" entry in your b.p.o account settings). This is necessary for legal reasons before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

Thanks again to your contribution and we look forward to looking at it!

@atombrella atombrella changed the title Replaced socket.method calls with super() in SSLSocket. bpo-31853: Replaced socket.method calls with super() in SSLSocket. Oct 23, 2017
@atombrella
Copy link
Contributor Author

@tiran Is there anything stalling this?

tiran
tiran requested changes Jan 27, 2018
View reviewed changes
Copy link
Member

@tiran tiran left a comment

Choose a reason for hiding this comment

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

Sorry, I forgot about your patch. LGTM, please fix indention and I'll merge it later today.

Lib/ssl.py Outdated
@@ -781,17 +781,16 @@ def __init__(self, sock=None, keyfile=None, certfile=None,
self.do_handshake_on_connect = do_handshake_on_connect
self.suppress_ragged_eofs = suppress_ragged_eofs
if sock is not None:
socket.__init__(self,
family=sock.family,
super().__init__(family=sock.family,
Copy link
Member

Choose a reason for hiding this comment

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

Please fix indention

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should be done. One attribute per line seems to be the style.

@bedevere-bot
Copy link

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

And if you don't make the requested changes, you will be put in the comfy chair!

@tiran
Copy link
Member

tiran commented Jan 27, 2018

Yeah, it looks fine now. Thanks for your contribution

@tiran tiran merged commit 746cc75 into python:master Jan 27, 2018
@bedevere-bot
Copy link

@tiran: Please replace # with GH- in the commit message next time. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tiran tiran tiran approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@atombrella @the-knights-who-say-ni @bedevere-bot @tiran