Index: Misc/NEWS =================================================================== --- Misc/NEWS (revision 65902) +++ Misc/NEWS (working copy) @@ -46,6 +46,12 @@ Library ------- +- Issue #1276: Add 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 #2834: update the regular expression library to match the unicode standards of py3k. In other words, mixing bytes and unicode strings (be it as pattern, search string or replacement string) raises a TypeError. Index: Lib/encodings/aliases.py =================================================================== --- Lib/encodings/aliases.py (revision 65902) +++ Lib/encodings/aliases.py (working copy) @@ -519,4 +519,9 @@ #'zip' : 'zlib_codec', #'zlib' : 'zlib_codec', + # temporary mac CJK aliases for 3.0, will be replaced in 3.1 + 'x_mac_japanese' : 'shift_jis', + 'x_mac_korean' : 'euc_kr', + 'x_mac_simp_chinese' : 'gb2312', + 'x_mac_trad_chinese' : 'big5', }