Update of /cvsroot/jython/jython/org/python/modules
In directory usw-pr-cvs1:/tmp/cvs-serv6866/modules
Modified Files:
_codecs.java
Log Message:
Add support for a default error argument to all the codecs methods.
Index: _codecs.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/_codecs.java,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -d -r2.8 -r2.9
*** _codecs.java 2001/07/14 22:23:03 2.8
--- _codecs.java 2001/08/05 13:42:28 2.9
***************
*** 36,39 ****
--- 36,43 ----
/* --- UTF-8 Codec --------------------------------------------------- */
+ public static PyTuple utf_8_decode(String str) {
+ return utf_8_decode(str, null);
+ }
+
public static PyTuple utf_8_decode(String str, String errors) {
int size = str.length();
***************
*** 146,149 ****
--- 150,157 ----
/* --- 7-bit ASCII Codec -------------------------------------------- */
+ public static PyTuple ascii_decode(String str) {
+ return ascii_decode(str, null);
+ }
+
public static PyTuple ascii_decode(String str, String errors) {
int size = str.length();
***************
*** 153,156 ****
--- 161,168 ----
+ public static PyTuple ascii_encode(String str) {
+ return ascii_encode(str, null);
+ }
+
public static PyTuple ascii_encode(String str, String errors) {
int size = str.length();
***************
*** 162,165 ****
--- 174,181 ----
/* --- Latin-1 Codec -------------------------------------------- */
+ public static PyTuple latin_1_decode(String str) {
+ return latin_1_decode(str, null);
+ }
+
public static PyTuple latin_1_decode(String str, String errors) {
int size = str.length();
***************
*** 182,186 ****
!
public static PyTuple latin_1_encode(String str, String errors) {
--- 198,204 ----
! public static PyTuple latin_1_encode(String str) {
! return latin_1_encode(str, null);
! }
public static PyTuple latin_1_encode(String str, String errors) {
***************
*** 203,206 ****
--- 221,228 ----
+ public static PyTuple utf_16_encode(String str) {
+ return utf_16_encode(str, null);
+ }
+
public static PyTuple utf_16_encode(String str, String errors) {
return codec_tuple(encode_UTF16(str, errors, 0), str.length());
***************
*** 213,220 ****
--- 235,250 ----
}
+ public static PyTuple utf_16_le_encode(String str) {
+ return utf_16_le_encode(str, null);
+ }
+
public static PyTuple utf_16_le_encode(String str, String errors) {
return codec_tuple(encode_UTF16(str, errors, -1), str.length());
}
+ public static PyTuple utf_16_be_encode(String str) {
+ return utf_16_be_encode(str, null);
+ }
+
public static PyTuple utf_16_be_encode(String str, String errors) {
return codec_tuple(encode_UTF16(str, errors, 1), str.length());
***************
*** 253,256 ****
--- 283,290 ----
+ public static PyTuple utf_16_decode(String str) {
+ return utf_16_decode(str, null);
+ }
+
public static PyTuple utf_16_decode(String str, String errors) {
int[] bo = new int[] { 0 };
***************
*** 264,267 ****
--- 298,305 ----
}
+ public static PyTuple utf_16_le_decode(String str) {
+ return utf_16_le_decode(str, null);
+ }
+
public static PyTuple utf_16_le_decode(String str, String errors) {
int[] bo = new int[] { -1 };
***************
*** 269,272 ****
--- 307,314 ----
}
+ public static PyTuple utf_16_be_decode(String str) {
+ return utf_16_be_decode(str, null);
+ }
+
public static PyTuple utf_16_be_decode(String str, String errors) {
int[] bo = new int[] { 1 };
***************
*** 274,277 ****
--- 316,323 ----
}
+ public static PyTuple utf_16_ex_decode(String str) {
+ return utf_16_ex_decode(str, null);
+ }
+
public static PyTuple utf_16_ex_decode(String str, String errors) {
return utf_16_ex_decode(str, errors, 0);
***************
*** 358,361 ****
--- 404,411 ----
+ public static PyTuple raw_unicode_escape_encode(String str) {
+ return raw_unicode_escape_encode(str, null);
+ }
+
public static PyTuple raw_unicode_escape_encode(String str,
String errors) {
***************
*** 366,369 ****
--- 416,423 ----
+ public static PyTuple raw_unicode_escape_decode(String str) {
+ return raw_unicode_escape_decode(str, null);
+ }
+
public static PyTuple raw_unicode_escape_decode(String str,
String errors) {
***************
*** 378,381 ****
--- 432,439 ----
+ public static PyTuple unicode_escape_encode(String str) {
+ return unicode_escape_encode(str, null);
+ }
+
public static PyTuple unicode_escape_encode(String str, String errors) {
return codec_tuple(PyString.encode_UnicodeEscape(str, false),
***************
*** 383,386 ****
--- 441,448 ----
}
+ public static PyTuple unicode_escape_decode(String str) {
+ return unicode_escape_decode(str, null);
+ }
+
public static PyTuple unicode_escape_decode(String str, String errors) {
int n = str.length();
***************
*** 394,399 ****
--- 456,469 ----
+ public static PyTuple unicode_internal_encode(String str) {
+ return unicode_internal_encode(str, null);
+ }
+
public static PyTuple unicode_internal_encode(String str, String errors) {
return codec_tuple(str, str.length());
+ }
+
+ public static PyTuple unicode_internal_decode(String str) {
+ return unicode_internal_decode(str, null);
}
|
