diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -41,9 +41,10 @@ from vcs.utils.helpers import get_scm from vcs.exceptions import VCSError from vcs.utils.lazy import LazyProperty +from rhodecode.lib import str2bool, safe_str, get_changeset_safe,\ + generate_api_key from rhodecode.lib.exceptions import UsersGroupsAssignedException -from rhodecode.lib import str2bool, json, safe_str, get_changeset_safe, \ - generate_api_key +from rhodecode.lib.compat import json from rhodecode.model.meta import Base, Session from rhodecode.model.caching_query import FromCache