[Python-checkins] CVS: python/dist/src/Lib/test testcodec.py,NONE,1.1 test_charmapcodec.py,1.1,1.2

[M.-A. Lemburg]

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv32293

Modified Files:
	test_charmapcodec.py 
Added Files:
	testcodec.py 
Log Message:
Moved the test codec definition to a new module and updated the test and
codec to test all charmap codec features.

As side-effect of moving the test codec into a new module, the encodings
package codec import mechanism is checked as well.



--- NEW FILE: testcodec.py ---
""" Test Codecs (used by test_charmapcodec)

Written by Marc-Andre Lemburg (mal@lemburg.com).

(c) Copyright 2000 Guido van Rossum.

"""#"
import codecs

### Codec APIs

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_map)

class StreamWriter(Codec,codecs.StreamWriter):
    pass
        
class StreamReader(Codec,codecs.StreamReader):
    pass

### encodings module API

def getregentry():

    return (Codec().encode,Codec().decode,StreamReader,StreamWriter)

### Decoding Map

decoding_map = codecs.make_identity_dict(range(256))
decoding_map.update({
        0x78: u"abc", # 1-n decoding mapping
        "abc": 0x0078,# 1-n encoding mapping
        0x01: None,   # decoding mapping to <undefined>
        0x79: u"",    # decoding mapping to <remove character>
})

### Encoding Map

encoding_map = {}
for k,v in decoding_map.items():
    encoding_map[v] = k


Index: test_charmapcodec.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_charmapcodec.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** test_charmapcodec.py	2001/01/06 15:09:56	1.1
--- test_charmapcodec.py	2001/01/10 10:21:10	1.2
***************
*** 1,4 ****
! """ Python Character Mapping Codec test
  
  Written by Marc-Andre Lemburg (mal@lemburg.com).
  
--- 1,7 ----
! """ Python character mapping codec test
  
+ This uses the test codec in testcodec.py and thus also tests the
+ encodings package lookup scheme.
+ 
  Written by Marc-Andre Lemburg (mal@lemburg.com).
  
***************
*** 6,65 ****
  
  """#"
- import codecs
- 
- ### Codec APIs
- 
- 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_map)
- 
- class StreamWriter(Codec,codecs.StreamWriter):
-     pass
-         
- class StreamReader(Codec,codecs.StreamReader):
-     pass
- 
- ### encodings module API
- 
- def getregentry():
  
-     return (Codec().encode,Codec().decode,StreamReader,StreamWriter)
- 
- ### Decoding Map
- 
- decoding_map = codecs.make_identity_dict(range(256))
- decoding_map.update({
-         0x0078: u"abc",
-         "abc": 0x0078,
- })
- 
- ### Encoding Map
- 
- encoding_map = {}
- for k,v in decoding_map.items():
-     encoding_map[v] = k
- 
- 
- ### Tests
- 
  def check(a, b):
      if a != b:
          print '*** check failed: %s != %s' % (repr(a), repr(b))
      
- check(unicode('abc', 'mycp'), u'abc')
- check(unicode('xdef', 'mycp'), u'abcdef')
- check(unicode('defx', 'mycp'), u'defabc')
- check(unicode('dxf', 'mycp'), u'dabcf')
- check(unicode('dxfx', 'mycp'), u'dabcfabc')
- 
- check(u'abc'.encode('mycp'), 'abc')
- check(u'xdef'.encode('mycp'), 'abcdef')
- check(u'defx'.encode('mycp'), 'defabc')
- check(u'dxf'.encode('mycp'), 'dabcf')
- check(u'dxfx'.encode('mycp'), 'dabcfabc')
--- 9,44 ----
  
  """#"
  
  def check(a, b):
      if a != b:
          print '*** check failed: %s != %s' % (repr(a), repr(b))
+     else:
+         print '%s == %s: OK' % (repr(a), repr(b))
+ 
+ # test codec's full path name (see test/testcodec.py)
+ codecname = 'testcodec'
+     
+ check(unicode('abc', codecname), u'abc')
+ check(unicode('xdef', codecname), u'abcdef')
+ check(unicode('defx', codecname), u'defabc')
+ check(unicode('dxf', codecname), u'dabcf')
+ check(unicode('dxfx', codecname), u'dabcfabc')
+ 
+ check(u'abc'.encode(codecname), 'abc')
+ check(u'xdef'.encode(codecname), 'abcdef')
+ check(u'defx'.encode(codecname), 'defabc')
+ check(u'dxf'.encode(codecname), 'dabcf')
+ check(u'dxfx'.encode(codecname), 'dabcfabc')
+ 
+ check(unicode('ydef', codecname), u'def')
+ check(unicode('defy', codecname), u'def')
+ check(unicode('dyf', codecname), u'df')
+ check(unicode('dyfy', codecname), u'df')
+ 
+ try:
+     unicode('abc\001', codecname)
+ except UnicodeError:
+     print '\\001 maps to undefined: OK'
+ else:
+     print '*** check failed: \\001 does not map to undefined'