Remove kvstore and move everything to park 0.9.1

cobe/brain.py

@@ -3,10 +3,10 @@
 import itertools
 import logging
 import math
+import park
 
 from cobe.analysis import (
     AccentNormalizer, StemNormalizer, WhitespaceAnalyzer)
-from cobe.kvstore import SqliteStore
 from cobe.model import Model
 from cobe.search import RandomWalkSearcher
 from cobe.utils import itime
@@ -42,7 +42,7 @@ class Brain(object):
     def __init__(self, filename):
         self.analyzer = StandardAnalyzer()
 
-        store = SqliteStore(filename)
+        store = park.SQLiteStore(filename)
 
         self.model = Model(self.analyzer, store)
         self.searcher = RandomWalkSearcher(self.model)

cobe/commands.py

@@ -4,14 +4,14 @@
 import fileinput
 import logging
 import os
+import park
 import re
 import readline
 import sys
 
 from . import analysis
 
 from .brain import Brain
-from .kvstore import SqliteStore
 from .model import Model
 from .varint import decode, decode_one, encode_one
 
@@ -26,7 +26,7 @@ def add_subparser(cls, parser):
 
     @staticmethod
     def run(args):
-        store = SqliteStore("cobe.store")
+        store = park.SQLiteStore("cobe.store")
         analyzer = analysis.WhitespaceAnalyzer()
         model = Model(analyzer, store)
 
@@ -40,7 +40,7 @@ def run(args):
 
         print "3-gram counts:"
         get_token = model.tokens.get_token
-        for ngram, count in model._prefix_items("3", skip_prefix=True):
+        for ngram, count in model._prefix_items("3", strip_prefix=True):
             # This needs a more efficient way to get the token ids,
             # maybe a simple varint-aware string split.
             grams = [get_token(encode_one(i)) for i in decode(ngram)]