[Python-checkins] CVS: python/dist/src/Lib codecs.py,1.12,1.13

[A.M. Kuchling]

Update of /cvsroot/python/python/dist/src/Lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv20536

Modified Files:
	codecs.py 
Log Message:
(Patch #102698) Fix for a bug reported by Wade Leftwich:
StreamReader ignores the 'errors' parameter passed to its constructor


Index: codecs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/codecs.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** codecs.py	2000/10/02 22:11:47	1.12
--- codecs.py	2000/12/10 15:12:14	1.13
***************
*** 206,210 ****
          # Unsliced reading:
          if size < 0:
!             return self.decode(self.stream.read())[0]
  
          # Sliced reading:
--- 206,210 ----
          # Unsliced reading:
          if size < 0:
!             return self.decode(self.stream.read(), self.errors)[0]
  
          # Sliced reading:
***************
*** 215,219 ****
          while 1:
              try:
!                 object, decodedbytes = decode(data)
              except ValueError,why:
                  # This method is slow but should work under pretty much
--- 215,219 ----
          while 1:
              try:
!                 object, decodedbytes = decode(data, self.errors)
              except ValueError,why:
                  # This method is slow but should work under pretty much
***************
*** 248,252 ****
          else:
              line = self.stream.readline(size)
!         return self.decode(line)[0]
  
  
--- 248,252 ----
          else:
              line = self.stream.readline(size)
!         return self.decode(line,self.errors)[0]
  
  
***************
*** 267,271 ****
          else:
              data = self.stream.read(sizehint)
!         return self.decode(data)[0].splitlines(1)
  
      def reset(self):
--- 267,271 ----
          else:
              data = self.stream.read(sizehint)
!         return self.decode(data,self.errors)[0].splitlines(1)
  
      def reset(self):