Commit 95b1ae76 authored by Tim Graham's avatar Tim Graham
Browse files

[1.8.x] Refs #23763 -- Fixed SMTPServer Python 3.5 deprecation warning in mail test. 

Backport of 7d97c574 from master
parent 2a36a9bb

tests/mail/tests.py

+3 −0
Original line number Diff line number Diff line
@@ -843,6 +843,9 @@ class FakeSMTPServer(smtpd.SMTPServer, threading.Thread): 


    def __init__(self, *args, **kwargs):

        threading.Thread.__init__(self)

        # New kwarg added in Python 3.5; default switching to False in 3.6.

        if sys.version_info >= (3, 5):

            kwargs['decode_data'] = True

        smtpd.SMTPServer.__init__(self, *args, **kwargs)

        self._sink = []

        self.active = False