From 95a8dfb92469a274eff9f3f42d40bf7251f9f439 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Sun, 23 Mar 2014 14:18:44 -0400 Subject: [PATCH] #20976: remove unneeded quopri import in email.utils. --- Lib/email/message.py | 3 ++- Lib/email/utils.py | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Lib/email/message.py b/Lib/email/message.py index b4bc8cbc9e..aa46debeba 100644 --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -8,6 +8,7 @@ __all__ = ['Message'] import re import uu +import quopri from io import BytesIO, StringIO # Intrapackage imports @@ -278,7 +279,7 @@ class Message: if not decode: return payload if cte == 'quoted-printable': - return utils._qdecode(bpayload) + return quopri.decodestring(bpayload) elif cte == 'base64': # XXX: this is a bit of a hack; decode_b should probably be factored # out somewhere, but I haven't figured out where yet. diff --git a/Lib/email/utils.py b/Lib/email/utils.py index 17f01bc106..cacb9b105a 100644 --- a/Lib/email/utils.py +++ b/Lib/email/utils.py @@ -36,10 +36,7 @@ from email._parseaddr import mktime_tz from email._parseaddr import parsedate, parsedate_tz, _parsedate_tz -from quopri import decodestring as _qdecode - # Intrapackage imports -from email.encoders import _bencode, _qencode from email.charset import Charset COMMASPACE = ', ' -- 2.40.0