summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-11-03 15:51:25 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-11-03 15:51:25 (GMT)
commit4e0f36b1565ba07a33d6b68f80c52be44cf916b2 (patch)
tree2de2ae931889427a4ef662bbb3c65ec80ba8f076 /Misc
parent76bcff27b2429d15805003ebeac8452698a61870 (diff)
parentfafa8b7797034aa799157172392a5b7721e1854a (diff)
downloadcpython-4e0f36b1565ba07a33d6b68f80c52be44cf916b2.zip
cpython-4e0f36b1565ba07a33d6b68f80c52be44cf916b2.tar.gz
cpython-4e0f36b1565ba07a33d6b68f80c52be44cf916b2.tar.bz2
#16152: merge with 3.3.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index bc5fc61..7f29033 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -77,6 +77,7 @@ Ulf Bartelt
Don Bashford
Pior Bastida
Nick Bastin
+Ned Batchelder
Jeff Bauer
Michael R Bax
Anthony Baxter
diff --git a/Misc/NEWS b/Misc/NEWS
index 5cbf5fe..8f11fc6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -91,6 +91,9 @@ Core and Builtins
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.