Re-organized the package

Renamed module name
Exposed minimum necessary symbols in package level

Author: hideaki-t

sqlitefts/__init__.py

@@ -0,0 +1,4 @@
+from .tokenizer import Tokenizer, make_tokenizer_module, register_tokenizer
+from . import tokenizer
+
+__all__ = ["Tokenizer", "make_tokenizer_module", "register_tokenizer", "tokenizer"]

sqlitefts/sqlite_tokenizer.py renamed to sqlitefts/tokenizer.py

@@ -5,7 +5,7 @@
 import struct
 import re
 
-import sqlitefts.sqlite_tokenizer as fts
+import sqlitefts as fts
 
 
 class SimpleTokenizer(fts.Tokenizer):
@@ -20,7 +20,7 @@ def tokenize(self, text):
 def test_make_tokenizer():
     c = sqlite3.connect(':memory:')
     tokenizer_module = fts.make_tokenizer_module(SimpleTokenizer())
-    assert fts.sqlite3_tokenizer_module == type(tokenizer_module)
+    assert fts.tokenizer.sqlite3_tokenizer_module == type(tokenizer_module)
     c.close()
 
 

tests/test_base.py

@@ -5,7 +5,7 @@
 import sqlite3
 import re
 
-import sqlitefts.sqlite_tokenizer as fts
+import sqlitefts as fts
 
 
 class BaseTokenizer(fts.Tokenizer):

tests/test_base2.py

@@ -4,7 +4,7 @@
 import ctypes
 import struct
 
-import sqlitefts.sqlite_tokenizer as fts
+import sqlitefts as fts
 
 import pytest
 igo = pytest.importorskip('igo')
@@ -25,7 +25,7 @@ def tokenize(self, text):
 def test_make_tokenizer():
     c = sqlite3.connect(':memory:')
     tokenizer_module = fts.make_tokenizer_module(t)
-    assert fts.sqlite3_tokenizer_module == type(tokenizer_module)
+    assert fts.tokenizer.sqlite3_tokenizer_module == type(tokenizer_module)
     c.close()
 
 

tests/test_igo.py

@@ -1,13 +1,10 @@
 # coding: utf-8
 from __future__ import print_function, unicode_literals
-import sys
-import os
 import sqlite3
 import ctypes
 import struct
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
-import sqlitefts.sqlite_tokenizer as fts
+import sqlitefts as fts
 
 import pytest
 ts = pytest.importorskip('tinysegmenter')
@@ -31,7 +28,7 @@ def tokenize(self, text):
 def test_make_tokenizer():
     c = sqlite3.connect(':memory:')
     tokenizer_module = fts.make_tokenizer_module(t)
-    assert fts.sqlite3_tokenizer_module == type(tokenizer_module)
+    assert fts.tokenizer.sqlite3_tokenizer_module == type(tokenizer_module)
     c.close()