summaryrefslogtreecommitdiffstats
path: root/Lib/email
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2014-03-23 18:18:44 (GMT)
committerR David Murray <rdmurray@bitdance.com>2014-03-23 18:18:44 (GMT)
commit95a8dfb92469a274eff9f3f42d40bf7251f9f439 (patch)
treec9a8bbc4a0ee46120c792d6d27da23ad9f8e0ea9 /Lib/email
parentf8cbbbb652caf694661ab0ee8a4858fc7692c59a (diff)
downloadcpython-95a8dfb92469a274eff9f3f42d40bf7251f9f439.zip
cpython-95a8dfb92469a274eff9f3f42d40bf7251f9f439.tar.gz
cpython-95a8dfb92469a274eff9f3f42d40bf7251f9f439.tar.bz2
#20976: remove unneeded quopri import in email.utils.
Diffstat (limited to 'Lib/email')
-rw-r--r--Lib/email/message.py3
-rw-r--r--Lib/email/utils.py3
2 files changed, 2 insertions, 4 deletions
diff --git a/Lib/email/message.py b/Lib/email/message.py
index b4bc8cb..aa46deb 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 17f01bc..cacb9b1 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 = ', '