From 9ae689d892756a6a5bd18ac044d927890ca17764 Mon Sep 17 00:00:00 2001
From: bwarsaw <>
Date: Tue, 30 Dec 2003 04:47:45 +0000
Subject: 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.
---
 misc/.cvsignore                   |   3 ++-
 misc/JapaneseCodecs-1.4.10.tar.gz | Bin 0 -> 288668 bytes
 misc/KoreanCodecs-2.0.5.tar.gz    | Bin 0 -> 260762 bytes
 misc/Makefile.in                  |   5 +++--
 misc/cjkcodecs-1.0.2.tar.gz       | Bin 500550 -> 0 bytes
 misc/paths.py.in                  |  14 +++++++++-----
 6 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 misc/JapaneseCodecs-1.4.10.tar.gz
 create mode 100644 misc/KoreanCodecs-2.0.5.tar.gz
 delete mode 100644 misc/cjkcodecs-1.0.2.tar.gz

diff --git a/misc/.cvsignore b/misc/.cvsignore
index 838a46c0..da2a6730 100644
--- a/misc/.cvsignore
+++ b/misc/.cvsignore
@@ -1,5 +1,6 @@
 Makefile
 paths.py
 mailman
-cjkcodecs-1.0.2
 email-2.5.4
+JapaneseCodecs-1.4.10
+KoreanCodecs-2.0.5
diff --git a/misc/JapaneseCodecs-1.4.10.tar.gz b/misc/JapaneseCodecs-1.4.10.tar.gz
new file mode 100644
index 00000000..2e3d351a
Binary files /dev/null and b/misc/JapaneseCodecs-1.4.10.tar.gz differ
diff --git a/misc/KoreanCodecs-2.0.5.tar.gz b/misc/KoreanCodecs-2.0.5.tar.gz
new file mode 100644
index 00000000..77edebdc
Binary files /dev/null and b/misc/KoreanCodecs-2.0.5.tar.gz differ
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 30696447..f2314c4d 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -53,9 +53,10 @@ SETUPCMD=	setup.py --quiet install $(SETUPINSTOPTS)
 PKGDIR= 	$(srcdir)
 
 EMAILPKG=	email-2.5.4
-CJKCODECSPKG=	cjkcodecs-1.0.2
+JACODECSPKG=	JapaneseCodecs-1.4.10
+KOCODECSPKG=	KoreanCodecs-2.0.5
 
-PACKAGES= $(EMAILPKG) $(CJKCODECSPKG)
+PACKAGES= $(EMAILPKG) $(JACODECSPKG) $(KOCODECSPKG)
 
 # Modes for directories and executables created by the install
 # process.  Default to group-writable directories but
diff --git a/misc/cjkcodecs-1.0.2.tar.gz b/misc/cjkcodecs-1.0.2.tar.gz
deleted file mode 100644
index 823e1528..00000000
Binary files a/misc/cjkcodecs-1.0.2.tar.gz and /dev/null differ
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
-- 
cgit v1.2.3