Update of /cvsroot/mailman/mailman/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv24964/misc

Modified Files:
      Tag: Release_2_1-maint
        .cvsignore Makefile.in paths.py.in 
Added Files:
      Tag: Release_2_1-maint
        CJKCodecs-1.0.tar.gz 
Removed Files:
      Tag: Release_2_1-maint
        JapaneseCodecs-1.4.9.tar.gz KoreanCodecs-2.0.5.tar.gz 
Log Message:
TK's patch # 865661 chunk which replaces JapaneseCodecs-1.4.9 and
KoreanCodecs-2.0.5 with CJKCodecs-1.0.


--- NEW FILE: CJKCodecs-1.0.tar.gz ---
(This appears to be a binary file; contents omitted.)

Index: .cvsignore
===================================================================
RCS file: /cvsroot/mailman/mailman/misc/.cvsignore,v
retrieving revision 2.2
retrieving revision 2.2.2.1
diff -u -d -r2.2 -r2.2.2.1
--- .cvsignore  17 Aug 2001 23:19:22 -0000      2.2
+++ .cvsignore  26 Dec 2003 21:46:09 -0000      2.2.2.1
@@ -1,3 +1,5 @@
 Makefile
 paths.py
 mailman
+CJKCodecs-1.0
+email-2.5.4

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mailman/mailman/misc/Makefile.in,v
retrieving revision 2.33.2.3
retrieving revision 2.33.2.4
diff -u -d -r2.33.2.3 -r2.33.2.4
--- Makefile.in 1 Dec 2003 00:12:30 -0000       2.33.2.3
+++ Makefile.in 26 Dec 2003 21:46:09 -0000      2.33.2.4
@@ -53,10 +53,9 @@
 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

Index: paths.py.in
===================================================================
RCS file: /cvsroot/mailman/mailman/misc/paths.py.in,v
retrieving revision 2.6
retrieving revision 2.6.2.1
diff -u -d -r2.6 -r2.6.2.1
--- paths.py.in 21 Oct 2002 19:52:05 -0000      2.6
+++ paths.py.in 26 Dec 2003 21:46:09 -0000      2.6.2.1
@@ -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 @@
 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

--- JapaneseCodecs-1.4.9.tar.gz DELETED ---

--- KoreanCodecs-2.0.5.tar.gz DELETED ---



_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to