[KoCo-CVS] [Commit] KoreanCodecs/korean/python euc_kr.py hangul.py iso_2022_kr.py johab.py qwerty2bul.py unijohab.py

[Chang <pe...@us...>]

perky       02/05/05 12:13:58

  Modified:    korean/python euc_kr.py hangul.py iso_2022_kr.py johab.py
                        qwerty2bul.py unijohab.py
  Log:
  - PyChecker Clean up
  
  Revision  Changes    Path
  1.5       +5 -7      KoreanCodecs/korean/python/euc_kr.py
  
  Index: euc_kr.py
  ===================================================================
  RCS file: /cvsroot/koco/KoreanCodecs/korean/python/euc_kr.py,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- euc_kr.py	28 Apr 2002 01:03:49 -0000	1.4
  +++ euc_kr.py	5 May 2002 19:13:57 -0000	1.5
  @@ -1,7 +1,7 @@
   # Hye-Shik Chang <16 Feb 2002>
   # originally written by Tamito KAJIYAMA
   #
  -# $Id: euc_kr.py,v 1.4 2002/04/28 01:03:49 perky Exp $
  +# $Id: euc_kr.py,v 1.5 2002/05/05 19:13:57 perky Exp $
   
   import codecs
   
  @@ -13,11 +13,10 @@
   class Codec(codecs.Codec):
   
       # Unicode to character buffer
  -    def encode(self, data, errors='strict',
  -               supported_errors=('strict', 'ignore', 'replace')):
  +    def encode(self, data, errors='strict'):
           global encmap_ideo, encmap_misc
   
  -        if errors not in supported_errors:
  +        if errors not in ('strict', 'ignore', 'replace'):
               raise UnicodeError, "unknown error handling"
           buffer = []
   
  @@ -49,11 +48,10 @@
           return (''.join(buffer), len(data))
   
       # character buffer to Unicode
  -    def decode(self, data, errors='strict',
  -               supported_errors=('strict', 'ignore', 'replace')):
  +    def decode(self, data, errors='strict'):
           global decmap_ideo, decmap_misc
   
  -        if errors not in supported_errors:
  +        if errors not in ('strict', 'ignore', 'replace'):
               raise UnicodeError, "unknown error handling"
   
           buffer = []
  
  
  
  1.11      +2 -1      KoreanCodecs/korean/python/hangul.py
  
  Index: hangul.py
  ===================================================================
  RCS file: /cvsroot/koco/KoreanCodecs/korean/python/hangul.py,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- hangul.py	1 May 2002 11:10:44 -0000	1.10
  +++ hangul.py	5 May 2002 19:13:57 -0000	1.11
  @@ -15,13 +15,14 @@
   # Conjoining Jamo Behavior:
   #  http://www.unicode.org/unicode/uni2book/ch03.pdf  (section 3.11)
   #
  -# $Id: hangul.py,v 1.10 2002/05/01 11:10:44 perky Exp $
  +# $Id: hangul.py,v 1.11 2002/05/05 19:13:57 perky Exp $
   #
   
   class UnicodeHangulError(Exception):
       
       def __init__ (self, msg):
           self.msg = msg
  +        Exception.__init__(self, msg)
       
       def __repr__ (self):
           return self.msg
  
  
  
  1.8       +5 -7      KoreanCodecs/korean/python/iso_2022_kr.py
  
  Index: iso_2022_kr.py
  ===================================================================
  RCS file: /cvsroot/koco/KoreanCodecs/korean/python/iso_2022_kr.py,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- iso_2022_kr.py	16 Mar 2002 02:35:20 -0000	1.7
  +++ iso_2022_kr.py	5 May 2002 19:13:57 -0000	1.8
  @@ -1,7 +1,7 @@
   # A codec for ISO-2022-KR [RFC1557]
   # by Hye-Shik Chang <17 February 2002>
   #
  -# $Id: iso_2022_kr.py,v 1.7 2002/03/16 02:35:20 perky Exp $
  +# $Id: iso_2022_kr.py,v 1.8 2002/05/05 19:13:57 perky Exp $
   
   import codecs
   from korean.mappings import ksc5601_hangul
  @@ -29,11 +29,10 @@
   
   class Codec(codecs.Codec):
       # Unicode to character buffer
  -    def encode(self, data, errors='strict',
  -               supported_errors=('strict', 'ignore', 'replace')):
  +    def encode(self, data, errors='strict'):
           global encmap_ideo, encmap_misc
   
  -        if errors not in supported_errors:
  +        if errors not in ('strict', 'ignore', 'replace'):
               raise UnicodeError, "unknown error handling"
           buffer = []
           new_charset = charset = US_ASCII
  @@ -90,11 +89,10 @@
           return (''.join(buffer), len(data))
   
       # character buffer to Unicode
  -    def decode(self, data, errors='strict',
  -               supported_errors=('strict', 'ignore', 'replace')):
  +    def decode(self, data, errors='strict'):
           global decmap_ideo, decmap_misc
           
  -        if errors not in supported_errors:
  +        if errors not in ('strict', 'ignore', 'replace'):
               raise UnicodeError, "unknown error handling"
           buffer = []
           data = str(data) # character buffer compatible object
  
  
  
  1.6       +5 -7      KoreanCodecs/korean/python/johab.py
  
  Index: johab.py
  ===================================================================
  RCS file: /cvsroot/koco/KoreanCodecs/korean/python/johab.py,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- johab.py	8 Apr 2002 12:49:57 -0000	1.5
  +++ johab.py	5 May 2002 19:13:58 -0000	1.6
  @@ -1,5 +1,5 @@
   # Hye-Shik Chang <16 Feb 2002>
  -# $Id: johab.py,v 1.5 2002/04/08 12:49:57 perky Exp $
  +# $Id: johab.py,v 1.6 2002/05/05 19:13:58 perky Exp $
   
   import codecs
   
  @@ -44,11 +44,10 @@
   class Codec(codecs.Codec):
   
       # Unicode to character buffer
  -    def encode(self, data, errors='strict',
  -               supported_errors=('strict', 'ignore', 'replace')):
  +    def encode(self, data, errors='strict'):
           global encmap
   
  -        if errors not in supported_errors:
  +        if errors not in ('strict', 'ignore', 'replace'):
               raise UnicodeError, "unknown error handling"
           buffer = []
   
  @@ -79,11 +78,10 @@
           return (''.join(buffer), len(data))
   
       # character buffer to Unicode
  -    def decode(self, data, errors='strict',
  -               supported_errors=('strict', 'ignore', 'replace')):
  +    def decode(self, data, errors='strict'):
           global decmap
   
  -        if errors not in supported_errors:
  +        if errors not in ('strict', 'ignore', 'replace'):
               raise UnicodeError, "unknown error handling"
   
           buffer = []
  
  
  
  1.6       +7 -8      KoreanCodecs/korean/python/qwerty2bul.py
  
  Index: qwerty2bul.py
  ===================================================================
  RCS file: /cvsroot/koco/KoreanCodecs/korean/python/qwerty2bul.py,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- qwerty2bul.py	26 Apr 2002 07:29:43 -0000	1.5
  +++ qwerty2bul.py	5 May 2002 19:13:58 -0000	1.6
  @@ -1,5 +1,5 @@
   # Hye-Shik Chang <16 Feb 2002>
  -# $Id: qwerty2bul.py,v 1.5 2002/04/26 07:29:43 perky Exp $
  +# $Id: qwerty2bul.py,v 1.6 2002/05/05 19:13:58 perky Exp $
   
   import codecs
   from korean.hangul import Moeum, Jaeum, Chosung, Jungsung, Jongsung
  @@ -30,6 +30,7 @@
           keycodemap[v] = k
           keycodemap.setdefault(v.upper(), k)
   keycodes = ''.join(keycodemap.keys())
  +del k, v
   
   
   class Automata_Hangul2:
  @@ -141,9 +142,8 @@
       BASECODEC = 'korean.cp949' # fallback codec of decoder
   
       # Unicode to key stroke
  -    def encode(self, data, errors='strict',
  -               supported_errors=('strict', 'ignore', 'replace')):
  -        if errors not in supported_errors:
  +    def encode(self, data, errors='strict'):
  +        if errors not in ('strict', 'ignore', 'replace'):
               raise UnicodeError, "unknown error handling"
   
           r = []
  @@ -160,9 +160,8 @@
           return (r, len(r))
   
       # key stroke to Unicode
  -    def decode(self, data, errors='strict',
  -               supported_errors=('strict', 'ignore', 'replace')):
  -        if errors not in supported_errors:
  +    def decode(self, data, errors='strict'):
  +        if errors not in ('strict', 'ignore', 'replace'):
               raise UnicodeError, "unknown error handling"
   
           s = unicode(data, self.BASECODEC, errors)
  @@ -176,5 +175,5 @@
   class StreamReader(Codec, codecs.StreamReader):
       pass
   
  -def getregentry(*args):
  +def getregentry():
       return (Codec().encode, Codec().decode, StreamReader, StreamWriter)
  
  
  
  1.5       +5 -9      KoreanCodecs/korean/python/unijohab.py
  
  Index: unijohab.py
  ===================================================================
  RCS file: /cvsroot/koco/KoreanCodecs/korean/python/unijohab.py,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- unijohab.py	24 Apr 2002 07:38:11 -0000	1.4
  +++ unijohab.py	5 May 2002 19:13:58 -0000	1.5
  @@ -1,5 +1,5 @@
   # Hye-Shik Chang <16 Feb 2002>
  -# $Id: unijohab.py,v 1.4 2002/04/24 07:38:11 perky Exp $
  +# $Id: unijohab.py,v 1.5 2002/05/05 19:13:58 perky Exp $
   
   import codecs
   from korean.hangul import ishangul, disjoint, conjoin
  @@ -7,19 +7,15 @@
   class Codec(codecs.Codec):
   
       # Unicode to character buffer
  -    def encode(self, data, errors='strict',
  -               supported_errors=('strict', 'ignore', 'replace')):
  -
  -        if errors not in supported_errors:
  +    def encode(self, data, errors='strict'):
  +        if errors not in ('strict', 'ignore', 'replace'):
               raise UnicodeError, "unknown error handling"
   
           return disjoint(data).encode('utf-8', errors), len(data)
   
       # character buffer to Unicode
  -    def decode(self, data, errors='strict',
  -               supported_errors=('strict', 'ignore', 'replace')):
  -
  -        if errors not in supported_errors:
  +    def decode(self, data, errors='strict'):
  +        if errors not in ('strict', 'ignore', 'replace'):
               raise UnicodeError, "unknown error handling"
   
           return conjoin(unicode(data, 'utf-8', errors)), len(data)