Rev 43597 on the branch purported to merge rev 43578 from the trunk,

but neglected to incorporate 43578's changes to
Lib/email/test/test_email.py.  As a result, all the buildbots have
failed test_email on the branch since then.  This should repair it.

diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index 1360bbe309ba07cb0043054c807cec291531532a..18f4894a31d0fe248928557f70e9406b50e1b0e2 100644 (file)
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -2110,12 +2110,12 @@ class TestMiscellaneous(TestEmailBase):
     def test_parsedate_no_dayofweek(self):
         eq = self.assertEqual
         eq(Utils.parsedate_tz('25 Feb 2003 13:47:26 -0800'),
-           (2003, 2, 25, 13, 47, 26, 0, 1, 0, -28800))
+           (2003, 2, 25, 13, 47, 26, 0, 1, -1, -28800))
 
     def test_parsedate_compact_no_dayofweek(self):
         eq = self.assertEqual
         eq(Utils.parsedate_tz('5 Feb 2003 13:47:26 -0800'),
-           (2003, 2, 5, 13, 47, 26, 0, 1, 0, -28800))
+           (2003, 2, 5, 13, 47, 26, 0, 1, -1, -28800))
 
     def test_parsedate_acceptable_to_time_functions(self):
         eq = self.assertEqual