Mercurial > kallithea

changeset 1387:d9fa335650d3 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moved json import into lib
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 17 Jun 2011 17:37:18 +0200
parents 5a31d387f347
children 2029c17cc6c6
files rhodecode/lib/__init__.py
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/__init__.py	Fri Jun 17 16:48:57 2011 +0200
+++ b/rhodecode/lib/__init__.py	Fri Jun 17 17:37:18 2011 +0200
@@ -24,6 +24,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+try:
+    import json
+except ImportError:
+    #python 2.5 compatibility
+    import simplejson as json
+
+
 def __get_lem():
     from pygments import lexers
     from string import lower