# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1365357330 -7200
# Node ID f37d7514e7abb98c41438ef0c4084e9211b2938a
# Parent  4839bc1d89fad354ef96583c1057d4376e928724
always use json from compat module

diff -r 4839bc1d89fa -r f37d7514e7ab rhodecode/bin/ldap_sync.py
--- a/rhodecode/bin/ldap_sync.py	Sun Apr 07 19:09:52 2013 +0200
+++ b/rhodecode/bin/ldap_sync.py	Sun Apr 07 19:55:30 2013 +0200
@@ -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 -r 4839bc1d89fa -r f37d7514e7ab rhodecode/controllers/admin/repos_groups.py
--- a/rhodecode/controllers/admin/repos_groups.py	Sun Apr 07 19:09:52 2013 +0200
+++ b/rhodecode/controllers/admin/repos_groups.py	Sun Apr 07 19:55:30 2013 +0200
@@ -37,7 +37,7 @@
 
 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 -r 4839bc1d89fa -r f37d7514e7ab rhodecode/controllers/home.py
--- a/rhodecode/controllers/home.py	Sun Apr 07 19:09:52 2013 +0200
+++ b/rhodecode/controllers/home.py	Sun Apr 07 19:55:30 2013 +0200
@@ -32,7 +32,7 @@
 
 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 -r 4839bc1d89fa -r f37d7514e7ab rhodecode/lib/utils.py
--- a/rhodecode/lib/utils.py	Sun Apr 07 19:09:52 2013 +0200
+++ b/rhodecode/lib/utils.py	Sun Apr 07 19:55:30 2013 +0200
@@ -765,7 +765,7 @@
 
     """
     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)