[Python-checkins] cpython (merge 3.4 -> default): #20977: merge with 3.4.

[ezio.melotti]

http://hg.python.org/cpython/rev/944fc499ccd3
changeset:   91993:944fc499ccd3
parent:      91991:45b208ae9eab
parent:      91992:9ec2b429a607
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Aug 04 17:17:21 2014 +0300
summary:
  #20977: merge with 3.4.

files:
  Lib/email/_header_value_parser.py                |   6 ++--
  Lib/test/test_email/test__header_value_parser.py |  12 ++++++++++
  Misc/ACKS                                        |   1 +
  3 files changed, 16 insertions(+), 3 deletions(-)


diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py
--- a/Lib/email/_header_value_parser.py
+++ b/Lib/email/_header_value_parser.py
@@ -2897,7 +2897,7 @@
     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 @@
     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()
diff --git a/Lib/test/test_email/test__header_value_parser.py b/Lib/test/test_email/test__header_value_parser.py
--- a/Lib/test/test_email/test__header_value_parser.py
+++ b/Lib/test/test_email/test__header_value_parser.py
@@ -2443,6 +2443,18 @@
         self.assertEqual(str(address_list.addresses[1]),
                          str(address_list.mailboxes[2]))
 
+    def test_invalid_content_disposition(self):
+        content_disp = self._test_parse_x(
+            parser.parse_content_disposition_header,
+            ";attachment", "; attachment", ";attachment",
+            [errors.InvalidHeaderDefect]*2
+        )
+
+    def test_invalid_content_transfer_encoding(self):
+        cte = self._test_parse_x(
+            parser.parse_content_transfer_encoding_header,
+            ";foo", ";foo", ";foo", [errors.InvalidHeaderDefect]*3
+        )
 
 @parameterize
 class Test_parse_mime_version(TestParserMixin, TestEmailBase):
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -35,6 +35,7 @@
 Kevin Altis
 Skyler Leigh Amador
 Joe Amenta
+Rose Ames
 A. Amoroso
 Mark Anacker
 Shashwat Anand

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