From: Jason R. Coombs <jaraco@jaraco.com>
Date: Sun, 28 Jun 2015 15:10:29 +0000 (-0400)
Subject: Issue #20387: Merge
X-Git-Tag: v3.5.0b3~35^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50373e6c21e933d2fee7039204bdc51c4475d634;p=thirdparty%2FPython%2Fcpython.git

Issue #20387: Merge
---

50373e6c21e933d2fee7039204bdc51c4475d634
diff --cc Misc/NEWS
index d1f6242b5f48,f2539d1f8bd5..1e1eba6944a3
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -60,9 -60,9 +60,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #20387: Restore semantic round-trip correctness in tokenize/untokenize
+   for tab-indented blocks.
+ 
 +- Issue #24456: Fixed possible buffer over-read in adpcm2lin() and lin2adpcm()
 +  functions of the audioop module.
 +
  - Issue #24336: The contextmanager decorator now works with functions with
    keyword arguments called "func" and "self".  Patch by Martin Panter.