[Python-checkins] python/dist/src/Lib/encodings bz2_codec.py, 1.3, 1.4

Mon Dec 1 08:26:48 EST 2003

Update of /cvsroot/python/python/dist/src/Lib/encodings
In directory sc8-pr-cvs1:/tmp/cvs-serv30883
Modified Files:
	bz2_codec.py 
Log Message:
Revert previous change. MAL preferred the old version.
Index: bz2_codec.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/encodings/bz2_codec.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** bz2_codec.py	1 Dec 2003 10:41:02 -0000	1.3
--- bz2_codec.py	1 Dec 2003 13:26:46 -0000	1.4
***************
*** 9,27 ****
 """
 import codecs
! import bz2

! def encode(input, errors='strict'):
 assert errors == 'strict'
 output = bz2.compress(input)
 return (output, len(input))

! def decode(input, errors='strict'):
 assert errors == 'strict'
 output = bz2.decompress(input)
 return (output, len(input))

 ### encodings module API

 def getregentry():

! return (encode, decode, codecs.StreamReader, codecs.StreamWriter)
--- 9,64 ----
 """
 import codecs
! import bz2 # this codec needs the optional bz2 module !

! ### Codec APIs
! 
! def bz2_encode(input,errors='strict'):
! 
! """ Encodes the object input and returns a tuple (output
! object, length consumed).
! 
! errors defines the error handling to apply. It defaults to
! 'strict' handling which is the only currently supported
! error handling for this codec.
! 
! """
 assert errors == 'strict'
 output = bz2.compress(input)
 return (output, len(input))

! def bz2_decode(input,errors='strict'):
! 
! """ Decodes the object input and returns a tuple (output
! object, length consumed).
! 
! input must be an object which provides the bf_getreadbuf
! buffer slot. Python strings, buffer objects and memory
! mapped files are examples of objects providing this slot.
! 
! errors defines the error handling to apply. It defaults to
! 'strict' handling which is the only currently supported
! error handling for this codec.
! 
! """
 assert errors == 'strict'
 output = bz2.decompress(input)
 return (output, len(input))

+ class Codec(codecs.Codec):
+ 
+ def encode(self, input, errors='strict'):
+ return bz2_encode(input, errors)
+ def decode(self, input, errors='strict'):
+ return bz2_decode(input, errors)
+ 
+ class StreamWriter(Codec,codecs.StreamWriter):
+ pass
+ 
+ class StreamReader(Codec,codecs.StreamReader):
+ pass
+ 
 ### encodings module API

 def getregentry():

! return (bz2_encode,bz2_decode,StreamReader,StreamWriter)