[Jython-checkins] CVS: jython/org/python/modules cStringIO.java,1.8,1.9

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

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

Modified Files:
	cStringIO.java 
Log Message:
Fix "[ #473676 ] cStringIO bug" where a 0 byte was return instead of
the empty string at EOF.



Index: cStringIO.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/cStringIO.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** cStringIO.java	2001/02/02 11:29:42	1.8
--- cStringIO.java	2001/10/27 21:55:45	1.9
***************
*** 141,145 ****
              int newpos = (size < 0) ? count : Math.min(pos+size, count);
              String r = null;
!             if (size == 1) {
                  r = cStringIO.getString(buf[pos]);
              } else {
--- 141,145 ----
              int newpos = (size < 0) ? count : Math.min(pos+size, count);
              String r = null;
!             if (size == 1 && newpos > pos) {
                  r = cStringIO.getString(buf[pos]);
              } else {