diff options
author | Thomas Wouters <thomas@python.org> | 2006-04-21 09:43:23 +0000 |
---|---|---|
committer | Thomas Wouters <thomas@python.org> | 2006-04-21 09:43:23 +0000 |
commit | a4795e7a6f50b2aaab3a761fc2b7614961103824 (patch) | |
tree | b9d813221c35025ebc9bec036875b73d0597a700 /Lib/encodings/cp737.py | |
parent | 5b0edfb83b728ff24e4fa0721ed45355cf9c2166 (diff) | |
download | cpython-a4795e7a6f50b2aaab3a761fc2b7614961103824.tar.gz |
Merge part of the trunk changes into the p3yk branch. This merges from 43030
(branch-creation time) up to 43067. 43068 and 43069 contain a little
swapping action between re.py and sre.py, and this mightily confuses svn
merge, so later changes are going in separately.
This merge should break no additional tests.
The last-merged revision is going in a 'last_merge' property on '.' (the
branch directory.) Arbitrarily chosen, really; if there's a BCP for this, I
couldn't find it, but we can easily change it afterwards ;)
Diffstat (limited to 'Lib/encodings/cp737.py')
-rw-r--r-- | Lib/encodings/cp737.py | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/Lib/encodings/cp737.py b/Lib/encodings/cp737.py index 883a8bac73..d6544482d2 100644 --- a/Lib/encodings/cp737.py +++ b/Lib/encodings/cp737.py @@ -1,4 +1,4 @@ -""" Python Character Mapping Codec generated from 'VENDORS/MICSFT/PC/CP737.TXT' with gencodec.py. +""" Python Character Mapping Codec cp737 generated from 'VENDORS/MICSFT/PC/CP737.TXT' with gencodec.py. """#" @@ -9,13 +9,19 @@ import codecs class Codec(codecs.Codec): def encode(self,input,errors='strict'): - return codecs.charmap_encode(input,errors,encoding_map) def decode(self,input,errors='strict'): - return codecs.charmap_decode(input,errors,decoding_table) +class IncrementalEncoder(codecs.IncrementalEncoder): + def encode(self, input, final=False): + return codecs.charmap_encode(input,self.errors,encoding_map)[0] + +class IncrementalDecoder(codecs.IncrementalDecoder): + def decode(self, input, final=False): + return codecs.charmap_decode(input,self.errors,decoding_table)[0] + class StreamWriter(Codec,codecs.StreamWriter): pass @@ -25,8 +31,15 @@ class StreamReader(Codec,codecs.StreamReader): ### encodings module API def getregentry(): - - return (Codec().encode,Codec().decode,StreamReader,StreamWriter) + return codecs.CodecInfo( + name='cp737', + encode=Codec().encode, + decode=Codec().decode, + incrementalencoder=IncrementalEncoder, + incrementaldecoder=IncrementalDecoder, + streamreader=StreamReader, + streamwriter=StreamWriter, + ) ### Decoding Map |