]> granicus.if.org Git - python/commitdiff
#16152: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 3 Nov 2012 15:51:25 +0000 (17:51 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 3 Nov 2012 15:51:25 +0000 (17:51 +0200)
1  2 
Misc/ACKS
Misc/NEWS

diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
index 5cbf5feab1daf95bae570e6ab704db61c2b16835,eaf6b3a79b86385c6abd27f2c5bae1d368ad2cfd..8f11fc66f0822a2bf7f9c2c2a8ff376819cb7fcc
+++ 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.