[Python-checkins] cpython (3.4): #20976: remove unneeded quopri import in email.utils.

[r.david.murray]

http://hg.python.org/cpython/rev/5d645f290d6a
changeset:   89932:5d645f290d6a
branch:      3.4
parent:      89930:c38ce7726737
user:        R David Murray <rdmurray at bitdance.com>
date:        Sun Mar 23 14:18:44 2014 -0400
summary:
  #20976: remove unneeded quopri import in email.utils.

files:
  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
--- a/Lib/email/message.py
+++ b/Lib/email/message.py
@@ -8,6 +8,7 @@
 
 import re
 import uu
+import quopri
 from io import BytesIO, StringIO
 
 # Intrapackage imports
@@ -278,7 +279,7 @@
         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
--- a/Lib/email/utils.py
+++ b/Lib/email/utils.py
@@ -36,10 +36,7 @@
 
 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 = ', '

-- 
Repository URL: http://hg.python.org/cpython