Backing out the switch to cjkcodecs. There were too many problems

with this including

- couldn't get correct, backwards compatible, working fixes into Python in time
- some controversy over whether cjkcodecs are best for Japanese.

As we're running out of time, we'll keep the status quo from Mailman
2.1.3 here.

1 files changed, 9 insertions, 5 deletions

diff --git a/misc/paths.py.in b/misc/paths.py.in
index 0bc896b3..c88d3e7f 100644
--- a/misc/paths.py.in
+++ b/misc/paths.py.in
@@ -49,8 +49,12 @@ sitedir = os.path.join(sys.prefix, 'lib', 'python'+sys.version[:3],
 sys.path.append(sitedir)
 
 
-# We explicitly import CJKCodecs here since we inhibit the importing of the
-# site module.  As of CJKCodecs-1.0, you have to do the second import.  We may
-# have to re-activate the first line if an upgrade changes this.
-#import cjkcodecs
-import cjkcodecs.aliases
+# In a normal interactive Python environment, the japanese.pth and korean.pth
+# files would be imported automatically.  But because we inhibit the importing
+# of the site module, we need to be explicit about importing these codecs.
+import japanese
+# As of KoreanCodecs 2.0.5, you had to do the second import to get the Korean
+# codecs installed, however leave the first import in there in case an upgrade
+# changes this.
+import korean
+import korean.aliases