summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-05-24 21:46:25 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-05-24 21:46:25 (GMT)
commite021f4b20622d272349ce9d05b9b1b4f5d183f8a (patch)
treec38224942f93960f2d51633e40fb34a3e0549441 /Misc
parentec883dba86b2e4109db0db20b9658251c918fc78 (diff)
downloadcpython-e021f4b20622d272349ce9d05b9b1b4f5d183f8a.zip
cpython-e021f4b20622d272349ce9d05b9b1b4f5d183f8a.tar.gz
cpython-e021f4b20622d272349ce9d05b9b1b4f5d183f8a.tar.bz2
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 b35acaf..ee62542 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -871,3 +871,4 @@ Siebren van der Zee
Uwe Zessin
Tarek Ziadé
Peter Åstrand
+Fredrik Håård
diff --git a/Misc/NEWS b/Misc/NEWS
index 36f374b..df36345 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -392,6 +392,9 @@ C-API
Library
-------
+- Issue #6662: Fix parsing of malformatted charref (&#bad;), patch written by
+ Fredrik Håård
+
- Issue #8540: Decimal module: rename the Context._clamp attribute to
Context.clamp and make it public. This is useful in creating
contexts that correspond to the decimal interchange formats