Skip to content

Commit 5628773

Browse files
committed
Address review feedback from picnixz
1 parent a3fb5a4 commit 5628773

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

Lib/http/client.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,8 @@ def __init__(self, sock, debuglevel=0, method=None, url=None):
296296

297297
def __repr__(self):
298298
if self.status is _UNKNOWN:
299-
return '<%s>' % (self.__class__.__name__,)
300-
return '<%s [%s %s]>' % (self.__class__.__name__, self.status, self.reason)
299+
return f'<{self.__class__.__name__}>'
300+
return f'<{self.__class__.__name__} [{self.status} {self.reason}]>'
301301

302302
def _read_status(self):
303303
line = str(self.fp.readline(_MAXLINE + 1), "iso-8859-1")
@@ -917,7 +917,8 @@ def __init__(self, host, port=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
917917
self._create_connection = socket.create_connection
918918

919919
def __repr__(self):
920-
return '<%s %s:%s>' % (self.__class__.__name__, self.host, self.port if self.port is not None else self.default_port)
920+
port = self.port if self.port is not None else self.default_port
921+
return f'<{self.__class__.__name__} {self.host}:{port}>'
921922

922923
def set_tunnel(self, host, port=None, headers=None):
923924
"""Set up host and port for HTTP CONNECT tunnelling.

Lib/test/test_httplib.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2373,15 +2373,15 @@ def test_http_connection_repr_explicit_port(self):
23732373
conn = client.HTTPConnection('example.com', 8080)
23742374
self.assertEqual(repr(conn), '<HTTPConnection example.com:8080>')
23752375

2376+
@unittest.skipUnless(hasattr(client, 'HTTPSConnection'),
2377+
'ssl support required')
23762378
def test_https_connection_repr(self):
2377-
if not hasattr(client, 'HTTPSConnection'):
2378-
self.skipTest('ssl support required')
23792379
conn = client.HTTPSConnection('example.com')
23802380
self.assertEqual(repr(conn), '<HTTPSConnection example.com:443>')
23812381

2382+
@unittest.skipUnless(hasattr(client, 'HTTPSConnection'),
2383+
'ssl support required')
23822384
def test_https_connection_repr_explicit_port(self):
2383-
if not hasattr(client, 'HTTPSConnection'):
2384-
self.skipTest('ssl support required')
23852385
conn = client.HTTPSConnection('example.com', 8443)
23862386
self.assertEqual(repr(conn), '<HTTPSConnection example.com:8443>')
23872387

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Add :func:`repr` support to :class:`http.client.HTTPConnection` and
1+
Add :meth:`~object.__repr__` support to :class:`http.client.HTTPConnection` and
22
:class:`http.client.HTTPResponse`, showing host/port and status/reason
33
respectively.

0 commit comments

Comments
 (0)