From: Raymond Hettinger <python@rcn.com>
Date: Wed, 25 Jun 2014 01:13:31 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1417
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d04d511078777544cbe5fe929a2ffba95c1976f1;p=python

merge
---

d04d511078777544cbe5fe929a2ffba95c1976f1
diff --cc Misc/NEWS
index 3382cc66f7,e1b206345f..416b46b481
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -105,9 -29,15 +105,11 @@@ Librar
  
  - Issue #21491: socketserver: Fix a race condition in child processes reaping.
  
 -- Issue #21832:  Require named tuple inputs to be exact strings.
 -
 -- Issue #21812: turtle.shapetransform did not tranform the turtle on the
 -  first call.  (Issue identified and fixed by Lita Cho.)
 +- Issue #21719: Added the ``st_file_attributes`` field to os.stat_result on
 +  Windows.
  
 -- Issue #21635:  The difflib SequenceMatcher.get_matching_blocks() method
 -  cache didn't match the actual result.  The former was a list of tuples
 -  and the latter was a list of named tuples.
++- Issue #21832:  Require named tuple inputs to be exact strings.
+ 
  - Issue #21722: The distutils "upload" command now exits with a non-zero
    return code when uploading fails.  Patch by Martin Dengler.