diff --git a/rhodecode/bin/ldap_sync.py b/rhodecode/bin/ldap_sync.py --- a/rhodecode/bin/ldap_sync.py +++ b/rhodecode/bin/ldap_sync.py @@ -14,7 +14,14 @@ import ldap import urllib2 import uuid -import json + +try: + from rhodecode.lib.compat import json +except ImportError: + try: + import simplejson as json + except ImportError: + import json from ConfigParser import ConfigParser diff --git a/rhodecode/controllers/admin/repos_groups.py b/rhodecode/controllers/admin/repos_groups.py --- a/rhodecode/controllers/admin/repos_groups.py +++ b/rhodecode/controllers/admin/repos_groups.py @@ -37,7 +37,7 @@ from sqlalchemy.exc import IntegrityErro import rhodecode from rhodecode.lib import helpers as h -from rhodecode.lib.ext_json import json +from rhodecode.lib.compat import json from rhodecode.lib.auth import LoginRequired, HasPermissionAnyDecorator,\ HasReposGroupPermissionAnyDecorator, HasReposGroupPermissionAll,\ HasPermissionAll diff --git a/rhodecode/controllers/home.py b/rhodecode/controllers/home.py --- a/rhodecode/controllers/home.py +++ b/rhodecode/controllers/home.py @@ -32,7 +32,7 @@ from sqlalchemy.sql.expression import fu import rhodecode from rhodecode.lib import helpers as h -from rhodecode.lib.ext_json import json +from rhodecode.lib.compat import json from rhodecode.lib.auth import LoginRequired from rhodecode.lib.base import BaseController, render from rhodecode.model.db import Repository diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py --- a/rhodecode/lib/utils.py +++ b/rhodecode/lib/utils.py @@ -765,7 +765,7 @@ def jsonify(func, *args, **kwargs): """ from pylons.decorators.util import get_pylons - from rhodecode.lib.ext_json import json + from rhodecode.lib.compat import json pylons = get_pylons(args) pylons.response.headers['Content-Type'] = 'application/json; charset=utf-8' data = func(*args, **kwargs)