summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-05-24 21:48:07 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-05-24 21:48:07 (GMT)
commit30c223cff53610ac07d575f19a5bd8dbc3715b72 (patch)
tree53a25bad3cee2e7317b8c95df021e715814ed2e6 /Misc
parent862793819186b67fe83bbbf77b092c10a1a02818 (diff)
downloadcpython-30c223cff53610ac07d575f19a5bd8dbc3715b72.zip
cpython-30c223cff53610ac07d575f19a5bd8dbc3715b72.tar.gz
cpython-30c223cff53610ac07d575f19a5bd8dbc3715b72.tar.bz2
Merged revisions 81504 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r81504 | victor.stinner | 2010-05-24 23:46:25 +0200 (lun., 24 mai 2010) | 13 lines Recorded merge of revisions 81500-81501 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81500 | victor.stinner | 2010-05-24 23:33:24 +0200 (lun., 24 mai 2010) | 2 lines Issue #6662: Fix parsing of malformatted charref (&#bad;) ........ r81501 | victor.stinner | 2010-05-24 23:37:28 +0200 (lun., 24 mai 2010) | 2 lines Add the author of the last fix (Issue #6662) ........ ................
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 838f6f0..459e216 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -846,3 +846,4 @@ Siebren van der Zee
Uwe Zessin
Tarek Ziadé
Peter Åstrand
+Fredrik Håård
diff --git a/Misc/NEWS b/Misc/NEWS
index 27d16aa..2b5b791 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -54,6 +54,9 @@ C-API
Library
-------
+- Issue #6662: Fix parsing of malformatted charref (&#bad;), patch written by
+ Fredrik Håård
+
- Issue #6268: Fix seek() method of codecs.open(), don't read or write the BOM
twice after seek(0). Fix also reset() method of codecs, UTF-16, UTF-32 and
StreamWriter classes.