diff options
Diffstat (limited to 'Lib/email')
| -rw-r--r-- | Lib/email/parser.py | 6 | ||||
| -rw-r--r-- | Lib/email/utils.py | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/Lib/email/parser.py b/Lib/email/parser.py index 439a4a02eb..06014e2b2e 100644 --- a/Lib/email/parser.py +++ b/Lib/email/parser.py @@ -68,11 +68,7 @@ class Parser: data = fp.read(8192) if not data: break - # XXX When Guido fixes TextIOWrapper.read() to act just like - # .readlines(), this... - feedparser.feed(str(data)) - # ...gets reverted back to - #feedparser.feed(data) + feedparser.feed(data) return feedparser.close() def parsestr(self, text, headersonly=False): diff --git a/Lib/email/utils.py b/Lib/email/utils.py index 8747110ef8..0439aff938 100644 --- a/Lib/email/utils.py +++ b/Lib/email/utils.py @@ -25,7 +25,6 @@ import time import base64 import random import socket -import urllib import warnings from io import StringIO @@ -235,6 +234,7 @@ def decode_params(params): params is a sequence of 2-tuples containing (param name, string value). """ + import urllib # Copy params so we don't mess with the original params = params[:] new_params = [] |