##// END OF EJS Templates
always use json from compat module
marcink -
r3705:f37d7514 beta
parent child Browse files
Show More
@@ -14,6 +14,13 b''
14 14 import ldap
15 15 import urllib2
16 16 import uuid
17
18 try:
19 from rhodecode.lib.compat import json
20 except ImportError:
21 try:
22 import simplejson as json
23 except ImportError:
17 24 import json
18 25
19 26 from ConfigParser import ConfigParser
@@ -37,7 +37,7 b' from sqlalchemy.exc import IntegrityErro'
37 37
38 38 import rhodecode
39 39 from rhodecode.lib import helpers as h
40 from rhodecode.lib.ext_json import json
40 from rhodecode.lib.compat import json
41 41 from rhodecode.lib.auth import LoginRequired, HasPermissionAnyDecorator,\
42 42 HasReposGroupPermissionAnyDecorator, HasReposGroupPermissionAll,\
43 43 HasPermissionAll
@@ -32,7 +32,7 b' from sqlalchemy.sql.expression import fu'
32 32
33 33 import rhodecode
34 34 from rhodecode.lib import helpers as h
35 from rhodecode.lib.ext_json import json
35 from rhodecode.lib.compat import json
36 36 from rhodecode.lib.auth import LoginRequired
37 37 from rhodecode.lib.base import BaseController, render
38 38 from rhodecode.model.db import Repository
@@ -765,7 +765,7 b' def jsonify(func, *args, **kwargs):'
765 765
766 766 """
767 767 from pylons.decorators.util import get_pylons
768 from rhodecode.lib.ext_json import json
768 from rhodecode.lib.compat import json
769 769 pylons = get_pylons(args)
770 770 pylons.response.headers['Content-Type'] = 'application/json; charset=utf-8'
771 771 data = func(*args, **kwargs)
General Comments 0
You need to be logged in to leave comments. Login now