kallithea Changeset - f37d7514e7ab

Changeset - f37d7514e7ab

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 13 years ago 2013-04-07 19:55:30
marcin@python-works.com

always use json from compat module

4 files changed with 10 insertions and 3 deletions:

rhodecode/bin/ldap_sync.py

rhodecode/controllers/admin/repos_groups.py

rhodecode/controllers/home.py

rhodecode/lib/utils.py

0 comments (0 inline, 0 general)

rhodecode/bin/ldap_sync.py

➞

Show inline comments

@@ @@ -14,6 +14,13 @@ @@
 import ldap
 import urllib2
 import uuid
 try:
     from rhodecode.lib.compat import json
 except ImportError:
     try:
         import simplejson as json
     except ImportError:
 import json
 from ConfigParser import ConfigParser

rhodecode/controllers/admin/repos_groups.py

➞

Show inline comments

@@ @@ -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

rhodecode/controllers/home.py

➞

Show inline comments

@@ @@ -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

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -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)

0 comments (0 inline, 0 general)