From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 3 Nov 2012 15:51:25 +0000 (+0200)
Subject: #16152: merge with 3.3.
X-Git-Tag: v3.4.0a1~2101
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e0f36b1565ba07a33d6b68f80c52be44cf916b2;p=thirdparty%2FPython%2Fcpython.git

#16152: merge with 3.3.
---

4e0f36b1565ba07a33d6b68f80c52be44cf916b2
diff --cc Misc/NEWS
index 5cbf5feab1da,eaf6b3a79b86..8f11fc66f082
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -91,9 -61,9 +91,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #16152: fix tokenize to ignore whitespace at the end of the code when
+   no newline is found.  Patch by Ned Batchelder.
+ 
 +- Issue #16284: Prevent keeping unnecessary references to worker functions
 +  in concurrent.futures ThreadPoolExecutor.
 +
  - Issue #1207589: Add Cut/Copy/Paste items to IDLE right click Context Menu
    Patch by Todd Rovito.