summaryrefslogtreecommitdiffstats
path: root/Lib/email
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2014-08-04 14:17:21 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2014-08-04 14:17:21 (GMT)
commitc734c387dee2f71f25e3dee0b2566f7eca960741 (patch)
tree8c7bbeb46ca4553b71bafa5736d49f7d71300822 /Lib/email
parentb398d3e4415291cd3fc779c1b49b10c5e39cde50 (diff)
parentd577480197f7cc427ac75deaebae3106399a9cd3 (diff)
downloadcpython-c734c387dee2f71f25e3dee0b2566f7eca960741.zip
cpython-c734c387dee2f71f25e3dee0b2566f7eca960741.tar.gz
cpython-c734c387dee2f71f25e3dee0b2566f7eca960741.tar.bz2
#20977: merge with 3.4.
Diffstat (limited to 'Lib/email')
-rw-r--r--Lib/email/_header_value_parser.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py
index 3dc5502..1806cac 100644
--- a/Lib/email/_header_value_parser.py
+++ b/Lib/email/_header_value_parser.py
@@ -2897,7 +2897,7 @@ def parse_content_disposition_header(value):
try:
token, value = get_token(value)
except errors.HeaderParseError:
- ctype.defects.append(errors.InvalidHeaderDefect(
+ disp_header.defects.append(errors.InvalidHeaderDefect(
"Expected content disposition but found {!r}".format(value)))
_find_mime_parameters(disp_header, value)
return disp_header
@@ -2928,8 +2928,8 @@ def parse_content_transfer_encoding_header(value):
try:
token, value = get_token(value)
except errors.HeaderParseError:
- ctype.defects.append(errors.InvalidHeaderDefect(
- "Expected content trnasfer encoding but found {!r}".format(value)))
+ cte_header.defects.append(errors.InvalidHeaderDefect(
+ "Expected content transfer encoding but found {!r}".format(value)))
else:
cte_header.append(token)
cte_header.cte = token.value.strip().lower()