[Python-checkins] r54342 - python/branches/release23-maint/Lib/email/Charset.py python/branches/release23-maint/Lib/email/__init__.py

[barry.warsaw]

Author: barry.warsaw
Date: Tue Mar 13 19:16:52 2007
New Revision: 54342

Modified:
   python/branches/release23-maint/Lib/email/Charset.py
   python/branches/release23-maint/Lib/email/__init__.py
Log:
SF patch #1556895; Typo in encoding name in email package.

Patch supplied by Guillaume Rousse.


Modified: python/branches/release23-maint/Lib/email/Charset.py
==============================================================================
--- python/branches/release23-maint/Lib/email/Charset.py	(original)
+++ python/branches/release23-maint/Lib/email/Charset.py	Tue Mar 13 19:16:52 2007
@@ -1,5 +1,5 @@
-# Copyright (C) 2001-2006 Python Software Foundation
-# Author: che at debian.org (Ben Gertzfield), barry at python.org (Barry Warsaw)
+# Copyright (C) 2001-2007 Python Software Foundation
+# Author: email-sig at python.org
 
 from types import UnicodeType
 from email.Encoders import encode_7or8bit
@@ -99,7 +99,7 @@
 # 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

Modified: python/branches/release23-maint/Lib/email/__init__.py
==============================================================================
--- python/branches/release23-maint/Lib/email/__init__.py	(original)
+++ python/branches/release23-maint/Lib/email/__init__.py	Tue Mar 13 19:16:52 2007
@@ -1,9 +1,9 @@
-# Copyright (C) 2001-2006 Python Software Foundation
-# Author: barry at python.org (Barry Warsaw)
+# Copyright (C) 2001-2007 Python Software Foundation
+# Author: email-sig at python.org
 
 """A package for parsing, handling, and generating email messages."""
 
-__version__ = '2.5.8'
+__version__ = '2.5.9'
 
 __all__ = [
     'base64MIME',