summaryrefslogtreecommitdiff
path: root/tests/mail
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2019-01-18 10:04:29 -0500
committerTim Graham <timograham@gmail.com>2019-01-30 10:19:48 -0500
commit7e6b214ed34f5562dbd83cf54924a5b589a29715 (patch)
tree2a2aa16c023638436bea449acdb06224bf7f33c7 /tests/mail
parent5a5c77d55dc85c7e6cf910243257e408887f412a (diff)
downloaddjango-7e6b214ed34f5562dbd83cf54924a5b589a29715.tar.gz
Fixed #30116 -- Dropped support for Python 3.5.
Diffstat (limited to 'tests/mail')
-rw-r--r--tests/mail/tests.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/mail/tests.py b/tests/mail/tests.py
index e283101b79..029d332c42 100644
--- a/tests/mail/tests.py
+++ b/tests/mail/tests.py
@@ -1211,10 +1211,7 @@ 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.
- # Setting a value only silences a deprecation warning in Python 3.5.
- kwargs['decode_data'] = True
- smtpd.SMTPServer.__init__(self, *args, **kwargs)
+ smtpd.SMTPServer.__init__(self, *args, decode_data=True, **kwargs)
self._sink = []
self.active = False
self.active_lock = threading.Lock()