#1276: Add temporary encoding aliases for non-supported Mac CJK

encodings that are detected as system defaults in MacOS with CJK
locales.  Will be replaced by properly-implemented codecs in 3.1.

diff --git a/Lib/encodings/aliases.py b/Lib/encodings/aliases.py
index 8e82806d88572ca981ccbc9958cc98f1cb387cc0..4c35588c88c25452d242728b9f4b165ccbcb0724 100644 (file)
--- a/Lib/encodings/aliases.py
+++ b/Lib/encodings/aliases.py
@@ -519,4 +519,9 @@ aliases = {
     #'zip'                : 'zlib_codec',
     #'zlib'               : 'zlib_codec',
 
+    # temporary mac CJK aliases, will be replaced by proper codecs in 3.1
+    'x_mac_japanese'      : 'shift_jis',
+    'x_mac_korean'        : 'euc_kr',
+    'x_mac_simp_chinese'  : 'gb2312',
+    'x_mac_trad_chinese'  : 'big5',
 }

diff --git a/Misc/NEWS b/Misc/NEWS
index 3173fcb71c3e69a11e52068e422e00abd778b9f5..dd91623af0ca4f2b26f3519b7179adebae25a112 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -60,6 +60,12 @@ Core and Builtins
 Library
 -------
 
+- Issue #1276: Added temporary aliases for CJK Mac encodings to resolve
+  a build problem on MacOS with CJK locales.  It adds four temporary
+  mappings to existing legacy codecs that are virtually compatible
+  with Mac encodings.  They will be replaced by codecs correctly
+  implemented in 3.1.
+
 - Issue #3614: Corrected a typo in xmlrpc.client, leading to a NameError
   "global name 'header' is not defined".