summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2014-07-25 22:00:30 (GMT)
committerRaymond Hettinger <python@rcn.com>2014-07-25 22:00:30 (GMT)
commita22d8231a3821e3b11c2153bef7970fb260e6860 (patch)
tree2bdb4c696f9ff39032b7fc8445b0e81526e51688 /Misc
parent19e020c5c713fcf24d66d72f5e599d57e8841360 (diff)
parent5a2146a2fdb9b8adf6472f1bedbba68c41bab232 (diff)
downloadcpython-a22d8231a3821e3b11c2153bef7970fb260e6860.zip
cpython-a22d8231a3821e3b11c2153bef7970fb260e6860.tar.gz
cpython-a22d8231a3821e3b11c2153bef7970fb260e6860.tar.bz2
merge
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 4a68015..c1c29d2 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -411,6 +411,7 @@ Russell Finn
Dan Finnie
Nils Fischbeck
Frederik Fix
+Tom Flanagan
Matt Fleming
Hernán Martínez Foffani
Artem Fokin
diff --git a/Misc/NEWS b/Misc/NEWS
index 7059888..b120f70 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -117,6 +117,9 @@ Library
- Issue #16133: The asynchat.async_chat.handle_read() method now ignores
BlockingIOError exceptions.
+- Issue #22044: Fixed premature DECREF in call_tzinfo_method.
+ Patch by Tom Flanagan.
+
- Issue #19884: readline: Disable the meta modifier key if stdout is not
a terminal to not write the ANSI sequence "\033[1034h" into stdout. This
sequence is used on some terminal (ex: TERM=xterm-256color") to enable