# HG changeset patch
# User Jeff Hammel <k0scist@gmail.com>
# Date 1606252311 28800
# Node ID 2d05ad36263776bf23725bd31c6305d0f5952b2d
# Parent  c280a43ac4423df776dd240d7cc1b6d431d871d0
py3

diff -r c280a43ac442 -r 2d05ad362637 toolbox/model.py
--- a/toolbox/model.py	Tue Nov 24 13:10:30 2020 -0800
+++ b/toolbox/model.py	Tue Nov 24 13:11:51 2020 -0800
@@ -3,18 +3,15 @@
 """
 
 import couchdb
+import json
 import os
 import pyes
 import sys
+
 from copy import deepcopy
-from search import WhooshSearch
 from time import time
-from util import str2filename
-
-try:
-    import json
-except ImportError:
-    import simplejson as json
+from .search import WhooshSearch
+from .util import str2filename
 
 # TODO: types of fields:
 # - string: a single string: {'type': 'string', 'name': 'name', 'required': True}