Merge 3681c6e into ac143c5

.travis.yml

@@ -9,7 +9,7 @@ python:
 addons:
   apt:
     packages:
-      - oracle-java8-set-default
+      - oracle-java8-installer
 env:
   - REDPEN_VERSION=1.9.0
 install:

ipadic/__init__.py.tmpl

@@ -20,7 +20,7 @@ def entries(compact = False):
     global __entries
     if not __entries:
         try:
-            from sysdic import entries_compact0, entries_compact1, entries_compact2, entries_compact3, entries_compact4, entries_compact5, entries_compact6, entries_compact7, entries_compact8, entries_compact9
+            from . import entries_compact0, entries_compact1, entries_compact2, entries_compact3, entries_compact4, entries_compact5, entries_compact6, entries_compact7, entries_compact8, entries_compact9
         except:
             raise LoadingDictionaryError()
         __entries = entries_compact0.DATA

janome/dic.py

@@ -52,7 +52,7 @@ def __dummy(*args, **kwargs):
 
 PY3 = sys.version_info[0] == 3
 
-SYSDIC_DIR = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "sysdic")
+SYSDIC_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'sysdic')
 
 FILE_FST_DATA = 'fst.data'
 

janome/tokenizer.py

@@ -95,7 +95,14 @@
 import os
 from .lattice import Lattice, Node, SurfaceNode, BOS, EOS, NodeType
 from .dic import SystemDictionary, MMapSystemDictionary, UserDictionary, CompiledUserDictionary
-from sysdic import entries, mmap_entries, connections, chardef, unknowns
+
+try:
+    from janome.sysdic import entries, mmap_entries, connections, chardef, unknowns
+except ImportError:
+    # hack for unit testing...
+    parent_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    sys.path.insert(0, parent_dir)
+    from sysdic import entries, mmap_entries, connections, chardef, unknowns
 
 PY3 = sys.version_info[0] == 3
 

janome/version.py

@@ -1 +1 @@
-JANOME_VERSION='0.3.8'
+JANOME_VERSION='0.3.9'

setup.py

@@ -5,20 +5,19 @@
 sys.path.append('./janome')
 sys.path.append('./tests')
 
-import os
+import os, shutil
 from zipfile import ZipFile
 from janome.dic import *
 from janome.version import JANOME_VERSION
 
 dicdir = 'ipadic'
 
-if not os.path.exists('sysdic') and os.path.exists(os.path.join('ipadic', 'sysdic.zip')):
+if os.path.exists(os.path.join(dicdir, 'sysdic.zip')):
+    shutil.rmtree('sysdic')
     print('Unzip dictionary data...')
     with ZipFile(os.path.join(dicdir, 'sysdic.zip')) as zf:
         zf.extractall()
 
-fst_data = [data_file for data_file in os.listdir('sysdic') if data_file.startswith('fst.data')]
-
 name = 'janome'
 
 with open(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'README.rst'), encoding='utf-8') as f:
@@ -46,9 +45,9 @@
     license='AL2',
     classifiers=classifiers,
     url='https://mocobeta.github.io/janome/en/',
-    packages=['janome','sysdic'],
-    package_data={'sysdic': fst_data},
-    py_modules=['janome.dic','janome.fst','janome.lattice','janome.tokenizer','janome.analyzer','janome.charfilter','janome.tokenfilter'],
+    packages=['janome', 'janome.sysdic'],
+    package_dir={'janome.sysdic': 'sysdic'},
+    package_data={'janome.sysdic': ['fst.data*']},
     scripts=['bin/janome', 'bin/janome.bat'],
     test_suite = 'suite'
 )