summaryrefslogtreecommitdiffstats
path: root/Lib/email/message.py
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2014-03-23 18:24:44 (GMT)
committerR David Murray <rdmurray@bitdance.com>2014-03-23 18:24:44 (GMT)
commit2791e0d4e3e961faaa95b3167327b4706b00fdcc (patch)
tree1601068a14ef13c66adae22826672ea1a1da5029 /Lib/email/message.py
parent211e6d5908e8ff2a903a10a54bced7b13c4f07c3 (diff)
parent95a8dfb92469a274eff9f3f42d40bf7251f9f439 (diff)
downloadcpython-2791e0d4e3e961faaa95b3167327b4706b00fdcc.zip
cpython-2791e0d4e3e961faaa95b3167327b4706b00fdcc.tar.gz
cpython-2791e0d4e3e961faaa95b3167327b4706b00fdcc.tar.bz2
Merge #20976: remove unneeded quopri import in email.utils.
Diffstat (limited to 'Lib/email/message.py')
-rw-r--r--Lib/email/message.py3
1 files changed, 2 insertions, 1 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.