changeset 13:2d05ad362637

py3
author Jeff Hammel <k0scist@gmail.com>
date Tue, 24 Nov 2020 13:11:51 -0800
parents c280a43ac442
children d66c25418f43
files toolbox/model.py
diffstat 1 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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}