[Python-checkins] python/dist/src/Modules/cjkcodecs _codecs_jp.c, 1.1.6.1, 1.1.6.2 cjkcodecs.h, 1.5.4.1, 1.5.4.2 multibytecodec.c, 1.3.4.1, 1.3.4.2

[jhylton@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules/cjkcodecs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27718/Modules/cjkcodecs

Modified Files:
      Tag: ast-branch
	_codecs_jp.c cjkcodecs.h multibytecodec.c 
Log Message:
Merge head to branch (for the last time)


Index: _codecs_jp.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cjkcodecs/_codecs_jp.c,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -u -d -r1.1.6.1 -r1.1.6.2
--- _codecs_jp.c	7 Jan 2005 07:03:32 -0000	1.1.6.1
+++ _codecs_jp.c	16 Oct 2005 05:24:04 -0000	1.1.6.2
@@ -36,7 +36,7 @@
 			continue;
 		}
 		else if (c >= 0xf8f0 && c <= 0xf8f3) {
-			/* Windows compatability */
+			/* Windows compatibility */
 			REQUIRE_OUTBUF(1)
 			if (c == 0xf8f0)
 				OUT1(0xa0)

Index: cjkcodecs.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cjkcodecs/cjkcodecs.h,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -u -d -r1.5.4.1 -r1.5.4.2
--- cjkcodecs.h	7 Jan 2005 07:03:35 -0000	1.5.4.1
+++ cjkcodecs.h	16 Oct 2005 05:24:04 -0000	1.5.4.2
@@ -12,7 +12,10 @@
 #include "multibytecodec.h"
 
 
-#define UNIINV	Py_UNICODE_REPLACEMENT_CHARACTER
+/* a unicode "undefined" codepoint */
+#define UNIINV	0xFFFE
+
+/* internal-use DBCS codepoints which aren't used by any charsets */
 #define NOCHAR	0xFFFF
 #define MULTIC	0xFFFE
 #define DBCINV	0xFFFD

Index: multibytecodec.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cjkcodecs/multibytecodec.c,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -d -r1.3.4.1 -r1.3.4.2
--- multibytecodec.c	7 Jan 2005 07:03:40 -0000	1.3.4.1
+++ multibytecodec.c	16 Oct 2005 05:24:04 -0000	1.3.4.2
@@ -1265,6 +1265,10 @@
 void
 init_multibytecodec(void)
 {
+	MultibyteCodec_Type.ob_type = &PyType_Type;
+	MultibyteStreamReader_Type.ob_type = &PyType_Type;
+	MultibyteStreamWriter_Type.ob_type = &PyType_Type;
+
 	Py_InitModule("_multibytecodec", __methods);
 
 	if (PyErr_Occurred())