Merge #20976: remove unneeded quopri import in email.utils.

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.

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 = ', '