adjust error messages; restore old _fatal_error implementation

Author: 1st1

Lib/asyncio/sslproto.py

@@ -7,7 +7,6 @@
 
 from . import base_events
 from . import constants
-from . import futures
 from . import protocols
 from . import transports
 from .log import logger
@@ -609,7 +608,7 @@ def _start_handshake(self):
     def _check_handshake_timeout(self):
         if self._in_handshake is True:
             msg = (
-                f"SSL handshake for {self} is taking longer than "
+                f"SSL handshake is taking longer than "
                 f"{self._ssl_handshake_timeout} seconds: "
                 f"aborting the connection"
             )
@@ -627,12 +626,9 @@ def _on_handshake_complete(self, handshake_exc):
             peercert = sslobj.getpeercert()
         except Exception as exc:
             if isinstance(exc, ssl.CertificateError):
-                msg = (
-                    f'{self}: SSL handshake failed on verifying '
-                    f'the certificate'
-                )
+                msg = 'SSL handshake failed on verifying the certificate'
             else:
-                msg = f'{self}: SSL handshake failed'
+                msg = 'SSL handshake failed'
             self._fatal_error(exc, msg)
             return
 
@@ -702,13 +698,19 @@ def _process_write_backlog(self):
                 raise
 
     def _fatal_error(self, exc, message='Fatal error on transport'):
+        if isinstance(exc, base_events._FATAL_ERROR_IGNORE):
+            if self._loop.get_debug():
+                logger.debug("%r: %s", self, message, exc_info=True)
+        else:
+            self._loop.call_exception_handler({
+                'message': message,
+                'exception': exc,
+                'transport': self._transport,
+                'protocol': self,
+            })
         if self._transport:
             self._transport._force_close(exc)
 
-        if (self._loop.get_debug() and
-                isinstance(exc, base_events._FATAL_ERROR_IGNORE)):
-            logger.debug("%r: %s", self, message, exc_info=True)
-
     def _finalize(self):
         self._sslpipe = None
 

Lib/test/test_asyncio/test_sslproto.py

@@ -587,8 +587,7 @@ async def client(addr):
         self.assertEqual(messages, [])
 
     def test_create_connection_ssl_failed_certificate(self):
-        messages = []
-        self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx))
+        self.loop.set_exception_handler(lambda loop, ctx: None)
 
         sslctx = test_utils.simple_server_sslcontext()
         client_sslctx = test_utils.simple_client_sslcontext(
@@ -619,11 +618,8 @@ async def client(addr):
             with self.assertRaises(ssl.SSLCertVerificationError):
                 self.loop.run_until_complete(client(srv.addr))
 
-        self.assertEqual(messages, [])
-
     def test_start_tls_client_corrupted_ssl(self):
-        messages = []
-        self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx))
+        self.loop.set_exception_handler(lambda loop, ctx: None)
 
         sslctx = test_utils.simple_server_sslcontext()
         client_sslctx = test_utils.simple_client_sslcontext()
@@ -662,7 +658,6 @@ async def client(addr):
             res = self.loop.run_until_complete(client(srv.addr))
 
         self.assertEqual(res, 'OK')
-        self.assertEqual(messages, [])
 
 
 @unittest.skipIf(ssl is None, 'No ssl module')