From 550cb3a365dee4edfdd1563224d5304de2a57fda Mon Sep 17 00:00:00 2001
From: Mads Jensen <mje@inducks.org>
Date: Thu, 9 Mar 2017 16:17:41 +0100
Subject: Fixed #27818 -- Replaced try/except/pass with contextlib.suppress().

---
 tests/mail/tests.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'tests/mail')

diff --git a/tests/mail/tests.py b/tests/mail/tests.py
index 50922e21d7..e1a7feb1f9 100644
--- a/tests/mail/tests.py
+++ b/tests/mail/tests.py
@@ -8,6 +8,7 @@ import socket
 import sys
 import tempfile
 import threading
+from contextlib import suppress
 from email import message_from_binary_file, message_from_bytes
 from email.header import Header
 from email.mime.text import MIMEText
@@ -1123,12 +1124,10 @@ class ConsoleBackendTests(BaseEmailBackendTests, SimpleTestCase):
 class FakeSMTPChannel(smtpd.SMTPChannel):
 
     def collect_incoming_data(self, data):
-        try:
+        # Ignore decode error in SSL/TLS connection tests as the test only
+        # cares whether the connection attempt was made.
+        with suppress(UnicodeDecodeError):
             smtpd.SMTPChannel.collect_incoming_data(self, data)
-        except UnicodeDecodeError:
-            # ignore decode error in SSL/TLS connection tests as we only care
-            # whether the connection attempt was made
-            pass
 
     def smtp_AUTH(self, arg):
         if arg == 'CRAM-MD5':
-- 
cgit v1.2.1