SF patch #1556895; Typo in encoding name in email package.

Patch supplied by Guillaume Rousse.

diff --git a/Lib/email/Charset.py b/Lib/email/Charset.py
index fb4e5a9b185d84b229fa613f5f8ad9ffe38c089e..0751abfb94ed1ef90f155eb3055eec9ec83a46ee 100644 (file)
--- a/Lib/email/Charset.py
+++ b/Lib/email/Charset.py
@@ -1,5 +1,5 @@
-# Copyright (C) 2001-2006 Python Software Foundation
-# Author: che@debian.org (Ben Gertzfield), barry@python.org (Barry Warsaw)
+# Copyright (C) 2001-2007 Python Software Foundation
+# Author: email-sig@python.org
 
 from types import UnicodeType
 from email.Encoders import encode_7or8bit
@@ -99,7 +99,7 @@ ALIASES = {
 # of stability and useability.
 
 CODEC_MAP = {
-    'gb2132':   'eucgb2312_cn',
+    'gb2312':   'eucgb2312_cn',
     'big5':     'big5_tw',
     'utf-8':    'utf-8',
     # Hack: We don't want *any* conversion for stuff marked us-ascii, as all

diff --git a/Lib/email/__init__.py b/Lib/email/__init__.py
index 1e03b0085f76db99da8ab85ebea1184371bfd0f5..1531140e6d39f86743be2d0b217c3a77d9485459 100644 (file)
--- a/Lib/email/__init__.py
+++ b/Lib/email/__init__.py
@@ -1,9 +1,9 @@
-# Copyright (C) 2001-2006 Python Software Foundation
-# Author: barry@python.org (Barry Warsaw)
+# Copyright (C) 2001-2007 Python Software Foundation
+# Author: email-sig@python.org
 
 """A package for parsing, handling, and generating email messages."""
 
-__version__ = '2.5.8'
+__version__ = '2.5.9'
 
 __all__ = [
     'base64MIME',