TK's patch # 865661 chunk which replaces JapaneseCodecs-1.4.9 and

KoreanCodecs-2.0.5 with CJKCodecs-1.0.

6 files changed, 13 insertions, 16 deletions

diff --git a/misc/.cvsignore b/misc/.cvsignore
index e7a13ed2..630b7e43 100644
--- a/misc/.cvsignore
+++ b/misc/.cvsignore
@@ -1,3 +1,5 @@
 Makefile
 paths.py
 mailman
+CJKCodecs-1.0
+email-2.5.4
diff --git a/misc/CJKCodecs-1.0.tar.gz b/misc/CJKCodecs-1.0.tar.gz
new file mode 100644
index 00000000..91fd60c9
--- /dev/null
+++ b/misc/CJKCodecs-1.0.tar.gz
diff --git a/misc/JapaneseCodecs-1.4.9.tar.gz b/misc/JapaneseCodecs-1.4.9.tar.gz
deleted file mode 100644
index c119a3d5..00000000
--- a/misc/JapaneseCodecs-1.4.9.tar.gz
+++ /dev/null
diff --git a/misc/KoreanCodecs-2.0.5.tar.gz b/misc/KoreanCodecs-2.0.5.tar.gz
deleted file mode 100644
index 77edebdc..00000000
--- a/misc/KoreanCodecs-2.0.5.tar.gz
+++ /dev/null
diff --git a/misc/Makefile.in b/misc/Makefile.in
index fc6fd1bc..385fcd03 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -53,10 +53,9 @@ SETUPCMD=	setup.py --quiet install $(SETUPINSTOPTS)
 PKGDIR= 	$(srcdir)
 
 EMAILPKG=	email-2.5.4
-JACODECSPKG=	JapaneseCodecs-1.4.9
-KOCODECSPKG=	KoreanCodecs-2.0.5
+CJKCODECSPKG=	CJKCodecs-1.0
 
-PACKAGES= $(EMAILPKG) $(JACODECSPKG) $(KOCODECSPKG)
+PACKAGES= $(EMAILPKG) $(CJKCODECSPKG)
 
 # Modes for directories and executables created by the install
 # process.  Default to group-writable directories but
diff --git a/misc/paths.py.in b/misc/paths.py.in
index 18451ac8..0bc896b3 100644
--- a/misc/paths.py.in
+++ b/misc/paths.py.in
@@ -1,19 +1,19 @@
 # -*- python -*-
 
-# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software 
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 # This file becomes paths.py which is installed in may directories.  By
@@ -49,12 +49,8 @@ sitedir = os.path.join(sys.prefix, 'lib', 'python'+sys.version[:3],
 sys.path.append(sitedir)
 
 
-# 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
+# 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