summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-12-23 17:55:21 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-12-23 17:55:21 (GMT)
commit159bb53765c895abb701d20881f13468484a9dba (patch)
treef3b787ba19235fce8b2dae5a0e8c770d292f8109 /Misc
parent41e66a26b0b86291f5fb846ffe2dc641b5ced65a (diff)
parent56ad5ed5ad37746228f7482fd501d8469539a2c1 (diff)
downloadcpython-159bb53765c895abb701d20881f13468484a9dba.zip
cpython-159bb53765c895abb701d20881f13468484a9dba.tar.gz
cpython-159bb53765c895abb701d20881f13468484a9dba.tar.bz2
merge heads
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 81af9fd..f9c75ab 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -543,6 +543,7 @@ Peter van Kampen
Rafe Kaplan
Jacob Kaplan-Moss
Jan Kaliszewski
+Anton Kasyanov
Lou Kates
Hiroaki Kawai
Sebastien Keim
diff --git a/Misc/NEWS b/Misc/NEWS
index 9a33632..e7fa7d9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -179,6 +179,9 @@ Core and Builtins
Library
-------
+- Issue #16443: Add docstrings to regular expression match objects.
+ Patch by Anton Kasyanov.
+
- Issue #15701: Fix HTTPError info method call to return the headers information.
- Issue #16646: ftplib.FTP.makeport() might lose socket error details.