jython-checkins

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv6866/core

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/core/codecs.java,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -d -r2.9 -r2.10
*** codecs.java	2001/02/25 16:51:51	2.9
--- codecs.java	2001/08/05 13:42:28	2.10
***************
*** 112,116 ****
          /* Decode via the codec registry */
          PyObject decoder = getDecoder(encoding);
!         PyObject result = decoder.__call__(v, new PyString(errors));
  
          if (!(result instanceof PyTuple) || result.__len__() != 2)
--- 112,121 ----
          /* Decode via the codec registry */
          PyObject decoder = getDecoder(encoding);
!         PyObject result = null;
!         if (errors != null) {
!             result = decoder.__call__(v, new PyString(errors));
!         } else {
!             result = decoder.__call__(v);
!         }
  
          if (!(result instanceof PyTuple) || result.__len__() != 2)
***************
*** 151,155 ****
          /* Decode via the codec registry */
          PyObject encoder = getEncoder(encoding);
!         PyObject result = encoder.__call__(v, new PyString(errors));
  
          if (!(result instanceof PyTuple) || result.__len__() != 2)
--- 156,165 ----
          /* Decode via the codec registry */
          PyObject encoder = getEncoder(encoding);
!         PyObject result = null;
!         if (errors != null) {
!             result = encoder.__call__(v, new PyString(errors));
!         } else {
!             result = encoder.__call__(v);
!         }
  
          if (!(result instanceof PyTuple) || result.__len__() != 2)