Fix misleading message in the string representation of `ClientConnect…

…orError` (#4097) (#4120)
aio-libs · Oct 1, 2019 · ac180b1 · ac180b1
1 parent 969188d
commit ac180b1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES/4097.bugfix b/CHANGES/4097.bugfix
@@ -0,0 +1 @@
+Fix misleading message in the string representation of `ClientConnectorError`; `self.ssl == None` means certification checks relaxed, not SSL disabled
diff --git a/aiohttp/client_exceptions.py b/aiohttp/client_exceptions.py
@@ -136,8 +136,9 @@ def ssl(self) -> Union[SSLContext, None, bool, 'Fingerprint']:
         return self._conn_key.ssl
 
     def __str__(self) -> str:
-        return ('Cannot connect to host {0.host}:{0.port} ssl:{0.ssl} [{1}]'
-                .format(self, self.strerror))
+        return ('Cannot connect to host {0.host}:{0.port} ssl:{1} [{2}]'
+                .format(self, self.ssl if self.ssl is not None else 'default',
+                        self.strerror))
 
     # OSError.__reduce__ does too much black magick
     __reduce__ = BaseException.__reduce__

diff --git a/tests/test_client_exceptions.py b/tests/test_client_exceptions.py
@@ -123,8 +123,8 @@ def test_str(self) -> None:
         err = client.ClientConnectorError(
             connection_key=self.connection_key,
             os_error=OSError(errno.ENOENT, 'No such file'))
-        assert str(err) == ("Cannot connect to host example.com:8080 ssl:None "
-                            "[No such file]")
+        assert str(err) == ("Cannot connect to host example.com:8080 ssl:"
+                            "default [No such file]")
 
 
 class TestClientConnectorCertificateError:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix misleading message in the string representation of `ClientConnectorError`; `self.ssl == None` means certification checks relaxed, not SSL disabled