From: R David Murray <rdmurray@bitdance.com>
Date: Sat, 10 Sep 2016 00:09:43 +0000 (-0400)
Subject: Merge: #14977: Make mailcap respect the order of the lines in the mailcap file.
X-Git-Tag: v3.6.0b1~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1319236167041f01c4efd4f7cc1400d2e4a18275;p=python

Merge: #14977: Make mailcap respect the order of the lines in the mailcap file.
---

1319236167041f01c4efd4f7cc1400d2e4a18275
diff --cc Lib/test/test_mailcap.py
index 5c7d6cb431,a85c69164d..c08423c670
--- a/Lib/test/test_mailcap.py
+++ b/Lib/test/test_mailcap.py
@@@ -1,5 -1,7 +1,6 @@@
  import mailcap
  import os
 -import shutil
+ import copy
  import test.support
  import unittest
  
diff --cc Misc/NEWS
index 649c3913c7,6ef92f7af8..3012a974e1
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -122,11 -62,9 +122,14 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #14977: mailcap now respects the order of the lines in the mailcap
+   files ("first match"), as required by RFC 1542.  Patch by Michael Lazar.
+ 
 +- Issue #28025: Convert all ssl module constants to IntEnum and IntFlags.
 +  SSLContext properties now return flags and enums.
 +
 +- Issue #433028: Added support of modifier spans in regular expressions.
 +
  - Issue #24594: Validates persist parameter when opening MSI database
  
  - Issue #28047: Fixed calculation of line length used for the base64 CTE
@@@ -142,9 -73,10 +145,13 @@@
  - Issue #27445: Don't pass str(_charset) to MIMEText.set_payload().
    Patch by Claude Paroz.
  
 +- Issue #24277: The new email API is no longer provisional, and the docs
 +  have been reorganized and rewritten to emphasize the new API.
 +
+ - Issue #22450: urllib now includes an "Accept: */*" header among the
+   default headers.  This makes the results of REST API requests more
+   consistent and predictable especially when proxy servers are involved.
+ 
  - lib2to3.pgen3.driver.load_grammar() now creates a stable cache file
    between runs given the same Grammar.txt input regardless of the hash
    randomization setting.