minor cleanup (necessary code removed)

Author: Johannes Otepka

ipyparallel/controller/sqlitedb.py

@@ -4,7 +4,6 @@
 # Distributed under the terms of the Modified BSD License.
 import json
 import os
-import re
 
 try:
     import cPickle as pickle
@@ -100,12 +99,6 @@ def _convert_timestamp(s):
     return ensure_timezone(dateutil_parse(s))
 
 
-def _regexp(expr, item):
-    """sqlite callback function for performing a regex operation"""
-    reg = re.compile(expr)
-    return reg.match(item) is not None
-
-
 # -----------------------------------------------------------------------------
 # SQLiteDB class
 # -----------------------------------------------------------------------------
@@ -279,7 +272,6 @@ def _init_db(self):
             # isolation_level = None)#,
             cached_statements=64,
         )
-        self._db.create_function("REGEXP", 2, _regexp)
         # print dir(self._db)
         first_table = previous_table = self.table
         i = 0

ipyparallel/tests/test_db.py

@@ -173,20 +173,6 @@ def test_find_records_glob(self):
             found = [r['msg_id'] for r in recs]
             assert set(ref) == set(found)
 
-        # hist = self.db.get_history()
-        #
-        # pattern = "*" + hist[0][5:-2] + "_?"
-        # ref = [msg_id for msg_id in hist if fnmatch.fnmatch(msg_id, pattern)]
-        # recs = self.db.find_records({'msg_id': {'$glob': pattern}}, ["msg_id"])
-        # found = [r['msg_id'] for r in recs]
-        # assert set(ref) == set(found)
-        #
-        # pattern = "*_1?"
-        # ref = [msg_id for msg_id in hist if fnmatch.fnmatch(msg_id, pattern)]
-        # recs = self.db.find_records({'msg_id': {'$glob': pattern}}, ["msg_id"])
-        # found = [r['msg_id'] for r in recs]
-        # assert set(ref) == set(found)
-
     def test_get_history(self):
         msg_ids = self.db.get_history()
         latest = datetime(1984, 1, 1).replace(tzinfo=utc)