Skip to content

bpo-39259: nntplib.NNTP/NNTP_SSL refactoring #17939

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

Merged
vstinner merged 3 commits into from
Jan 11, 2020
+18 −24
Merged

bpo-39259: nntplib.NNTP/NNTP_SSL refactoring #17939

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75f02df
nntplib.NNTP/NNTP_SSL refactoring
corona10 Jan 10, 2020
99033c4
bbpo-39259: Revert timeout check logic
corona10 Jan 10, 2020
4f65135
bpo-39259: Apply code review
corona10 Jan 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 18 additions & 24 deletions Lib/nntplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,13 +1042,11 @@ def __init__(self, host, port=NNTP_PORT, user=None, password=None,
"""
self.host = host
self.port = port
sys.audit("nntplib.connect", self, host, port)
self.sock = socket.create_connection((host, port), timeout)
self.sock = self._create_socket(timeout)
file = None
try:
file = self.sock.makefile("rwb")
_NNTPBase.__init__(self, file, host,
readermode, timeout)
super().__init__(file, host, readermode, timeout)
if user or usenetrc:
self.login(user, password, usenetrc)
except:
Expand All @@ -1057,15 +1055,19 @@ def __init__(self, host, port=NNTP_PORT, user=None, password=None,
self.sock.close()
raise

def _create_socket(self, timeout):
sys.audit("nntplib.connect", self, self.host, self.port)
return socket.create_connection((self.host, self.port), timeout)

def _close(self):
try:
_NNTPBase._close(self)
super()._close()
finally:
self.sock.close()


if _have_ssl:
class NNTP_SSL(_NNTPBase):
class NNTP_SSL(NNTP):

def __init__(self, host, port=NNTP_SSL_PORT,
user=None, password=None, ssl_context=None,
Expand All @@ -1074,27 +1076,19 @@ def __init__(self, host, port=NNTP_SSL_PORT,
"""This works identically to NNTP.__init__, except for the change
in default port and the `ssl_context` argument for SSL connections.
"""
sys.audit("nntplib.connect", self, host, port)
self.sock = socket.create_connection((host, port), timeout)
file = None
self.ssl_context = ssl_context
super().__init__(host, port, user, password, readermode,
usenetrc, timeout)

def _create_socket(self, timeout):
sock = super()._create_socket(timeout)
try:
self.sock = _encrypt_on(self.sock, ssl_context, host)
file = self.sock.makefile("rwb")
_NNTPBase.__init__(self, file, host,
readermode=readermode, timeout=timeout)
if user or usenetrc:
self.login(user, password, usenetrc)
sock = _encrypt_on(sock, self.ssl_context, self.host)
except:
if file:
file.close()
self.sock.close()
sock.close()
raise

def _close(self):
try:
_NNTPBase._close(self)
finally:
self.sock.close()
else:
return sock

__all__.append("NNTP_SSL")

Expand Down