summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-09-01 15:16:41 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-09-01 15:16:41 (GMT)
commita2983c6734f06a0ccb32d03877e3f90e46fbdabb (patch)
tree9f24ef3c6dec8e8066c7e64335202109b39e9bc2 /Misc
parentb83df8f1b7a3ff3689de4b6d3c36592f1c84492c (diff)
downloadcpython-a2983c6734f06a0ccb32d03877e3f90e46fbdabb.zip
cpython-a2983c6734f06a0ccb32d03877e3f90e46fbdabb.tar.gz
cpython-a2983c6734f06a0ccb32d03877e3f90e46fbdabb.tar.bz2
Merged revisions 84394 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84394 | antoine.pitrou | 2010-09-01 17:10:12 +0200 (mer., 01 sept. 2010) | 4 lines Issue #7415: PyUnicode_FromEncodedObject() now uses the new buffer API properly. Patch by Stefan Behnel. ........
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 dfbbc81..b4ac3a7 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -58,6 +58,7 @@ David Beazley
Robin Becker
Neal Becker
Bill Bedford
+Stefan Behnel
Reimer Behrends
Ben Bell
Thomas Bellman
diff --git a/Misc/NEWS b/Misc/NEWS
index 8fc8d08..4086378 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.1.3?
Core and Builtins
-----------------
+- Issue #7415: PyUnicode_FromEncodedObject() now uses the new buffer API
+ properly. Patch by Stefan Behnel.
+
- Restore GIL in nis_cat in case of error.
- Issue #9712: Fix tokenize on identifiers that start with non-ascii names.