Index: StringIO.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/StringIO.py,v
retrieving revision 1.35
diff -c -r1.35 StringIO.py
*** StringIO.py	14 Mar 2004 07:54:37 -0000	1.35
--- StringIO.py	12 May 2004 16:50:04 -0000
***************
*** 84,90 ****
          """
          if not self.closed:
              self.closed = True
!             del self.buf, self.pos
  
      def isatty(self):
          """Returns False because StringIO objects are not connected to a
--- 84,90 ----
          """
          if not self.closed:
              self.closed = True
!             del self.buf, self.buflist
  
      def isatty(self):
          """Returns False because StringIO objects are not connected to a
***************
*** 103,111 ****
          There is no return value.
          """
          _complain_ifclosed(self.closed)
-         if self.buflist:
-             self.buf += ''.join(self.buflist)
-             self.buflist = []
          if mode == 1:
              pos += self.pos
          elif mode == 2:
--- 103,108 ----
***************
*** 127,133 ****
          """
          _complain_ifclosed(self.closed)
          if self.buflist:
!             self.buf += ''.join(self.buflist)
              self.buflist = []
          if n < 0:
              newpos = self.len
--- 124,130 ----
          """
          _complain_ifclosed(self.closed)
          if self.buflist:
!             self.buf = ''.join([self.buf] + self.buflist)
              self.buflist = []
          if n < 0:
              newpos = self.len
***************
*** 152,158 ****
          """
          _complain_ifclosed(self.closed)
          if self.buflist:
!             self.buf += ''.join(self.buflist)
              self.buflist = []
          i = self.buf.find('\n', self.pos)
          if i < 0:
--- 149,155 ----
          """
          _complain_ifclosed(self.closed)
          if self.buflist:
!             self.buf = ''.join([self.buf] + self.buflist)
              self.buflist = []
          i = self.buf.find('\n', self.pos)
          if i < 0:
***************
*** 204,209 ****
--- 201,207 ----
          elif size < self.pos:
              self.pos = size
          self.buf = self.getvalue()[:size]
+         self.len = len(self.buf)
  
      def write(self, s):
          """Write a string to the file.
***************
*** 225,231 ****
          newpos = self.pos + len(s)
          if self.pos < self.len:
              if self.buflist:
!                 self.buf += ''.join(self.buflist)
                  self.buflist = []
              self.buflist = [self.buf[:self.pos], s, self.buf[newpos:]]
              self.buf = ''
--- 223,229 ----
          newpos = self.pos + len(s)
          if self.pos < self.len:
              if self.buflist:
!                 self.buf = ''.join([self.buf] + self.buflist)
                  self.buflist = []
              self.buflist = [self.buf[:self.pos], s, self.buf[newpos:]]
              self.buf = ''
***************
*** 265,271 ****
          is called.
          """
          if self.buflist:
!             self.buf += ''.join(self.buflist)
              self.buflist = []
          return self.buf
  
--- 263,269 ----
          is called.
          """
          if self.buflist:
!             self.buf = ''.join([self.buf] + self.buflist)
              self.buflist = []
          return self.buf
  
Index: test/test_StringIO.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_StringIO.py,v
retrieving revision 1.17
diff -c -r1.17 test_StringIO.py
*** test/test_StringIO.py	8 Aug 2003 12:20:03 -0000	1.17
--- test/test_StringIO.py	12 May 2004 16:50:04 -0000
***************
*** 52,57 ****
--- 52,59 ----
          f.seek(0)
          f.truncate(5)
          eq(f.getvalue(), 'abcde')
+         f.seek(0, 2)
+         eq(f.tell(), 5)
          f.close()
          self.assertRaises(ValueError, f.write, 'frobnitz')