From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Wed, 1 Jul 2009 00:50:34 +0000 (+0000)
Subject: Merged revisions 73724 via svnmerge from
X-Git-Tag: v3.1.1rc1~116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41a28734b41610c91cf3013b4af8ac490c94c801;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 73724 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r73724 | amaury.forgeotdarc | 2009-07-01 02:48:39 +0200 (mer., 01 juil. 2009) | 2 lines

  Fix exception name in NEWS, spotted by Neal Norwitz
........
---

diff --git a/Misc/NEWS b/Misc/NEWS
index fb1fee720e40..0b66254f5e48 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,7 +16,7 @@ Core and Builtins
   This fixes a build failure on HP-UX: int32_t and uint32_t are
   defined in inttypes.h instead of stdint.h on that platform.
 
-- Issue #6373: Fixed a RuntimeError when encoding with the latin-1 codec and
+- Issue #6373: Fixed a SystemError when encoding with the latin-1 codec and
   the 'surrogateescape' error handler, a string which contains unpaired
   surrogates.