Merge pull request #32 from miurahr/universal_with_six

Use six for compatibility

pykakasi/a2.py

@@ -4,10 +4,7 @@
 # Copyright 2014 Hiroshi Miura <[email protected]>
 #
 
-try:
-    unicode
-except: #Python3
-    unichr = chr
+from six import unichr
 
 class a2 (object):
     _table_1 = [ u"\u3000",u"\uff01",u"\uff02",u"\uff03",u"\uff04",u"\uff05",u"\uff06",

pykakasi/h2a.py

@@ -25,11 +25,7 @@
 # * 02111-1307, USA.
 # */
 
-try:
-    xrange
-except:
-    # Python3.x
-    xrange = range
+from six.moves import xrange
 from .jisyo import jisyo
 from .exceptions import UnsupportedRomanRulesException
 

pykakasi/h2k.py

@@ -25,12 +25,8 @@
 # * 02111-1307, USA.
 # */
 
-try:
-    xrange
-except:
-    # Python3.x
-    xrange = range
-    unichr = chr
+from six import unichr
+from six.moves import xrange
 
 class H2K (object):
 

pykakasi/itaiji.py

@@ -5,11 +5,7 @@
 #
 import re
 from pkg_resources import resource_filename
-
-try: # pragma: no cover
-    import cPickle as pickle
-except: # pragma: no cover
-    import pickle
+from six.moves.cPickle import load
 
 class itaiji (object):
 
@@ -28,7 +24,7 @@ def __init__(self):
         if self._itaijidict is None:
             itaijipath = resource_filename(__name__, 'itaijidict2.pickle')
             itaiji_pkl = open(itaijipath, 'rb')
-            (self._itaijidict, self._itaijidict_len) = pickle.load(itaiji_pkl)
+            (self._itaijidict, self._itaijidict_len) = load(itaiji_pkl)
 
     def haskey(self, key):
         return key in self._itaijidict

pykakasi/jisyo.py

@@ -1,12 +1,9 @@
 # -*- coding: utf-8 -*-
 #  jisyo.py
 #
-# Copyright 2011,2014 Hiroshi Miura <[email protected]>
+# Copyright 2011-2018 Hiroshi Miura <[email protected]>
 from pkg_resources import resource_filename
-try: #python2
-    from cPickle import load
-except: #python3
-    from pickle import load
+from six.moves.cPickle import load
 
 class jisyo (object):
     _dict = None

pykakasi/k2h.py

@@ -25,12 +25,8 @@
 # * 02111-1307, USA.
 # */
 
-try:
-    xrange
-except:
-    # Python3.x
-    xrange = range
-    unichr = chr
+from six import unichr
+from six.moves import range
 
 class K2H (object):
 
@@ -46,11 +42,10 @@ def convert(self, text):
         Hstr = ""
         max_len = 0
         r = len(text)
-        for x in xrange(r):
+        for x in range(r):
             if self.isRegion(text[x]):
                 Hstr = Hstr + unichr(ord(text[x]) - self._diff)
                 max_len = max_len + 1
             else:
                 break
         return (Hstr, max_len)
-

pykakasi/kanwa.py

@@ -5,6 +5,7 @@
 from zlib import decompress
 from pkg_resources import resource_filename
 from marshal import loads
+import six
 
 try:
     import anydbm as dbm
@@ -30,11 +31,10 @@ def __init__(self):
             self._kanwadict = dbm.open(dictpath,'r')
 
     def load(self, char):
-        try:#python2
+        if six.PY2:
             key = "%04x"%ord(unicode(char))
-        except:#python3
+        else:
             key = "%04x"%ord(char)
-
         try: #already exist?
             table = self._jisyo_table[key]
         except:

pykakasi/symbols.py

@@ -51,6 +51,8 @@
 ----------------------------------------------------------
 '''
 
+import six
+
 class sym2 (object):
     # U3000 - 301F
     # \u3000、。〃〄〆〈〉《》「」『』【】〒〓〔〕〖〗〘〙
@@ -93,10 +95,7 @@ def convert(self, text):
         elif (0x03b1 <= c and c <= 0x03c9):
             return self._table_4[c-0x03b1]
         elif (0xff10 <= c and c < 0xff20):
-            try:
-                return unichr(c - 0xff10 + ord('0'))
-            except:
-                return chr(c - 0xff10 + ord('0'))
+            return six.unichr(c - 0xff10 + ord('0'))
         else:
             return None # pragma: no cover
 

requirements.txt

@@ -1,3 +1,4 @@
 setuptools
 wheel
 nose
+six