diff rhodecode/lib/celerylib/tasks.py @ 1514:87ec80c280bb beta

fixed issues with python2.5 added compat module to rhodecode to have one point of fetching backward incompatible libs.
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 07 Oct 2011 02:51:18 +0200
parents 5875955def39
children da8f1d1b22de 191f3f08236d
line wrap: on
line diff
--- a/rhodecode/lib/celerylib/tasks.py	Wed Oct 05 00:10:42 2011 +0200
+++ b/rhodecode/lib/celerylib/tasks.py	Fri Oct 07 02:51:18 2011 +0200
@@ -43,7 +43,8 @@
 from rhodecode.lib.helpers import person
 from rhodecode.lib.smtp_mailer import SmtpMailer
 from rhodecode.lib.utils import add_cache
-from rhodecode.lib.odict import OrderedDict
+from rhodecode.lib.compat import json, OrderedDict
+
 from rhodecode.model import init_model
 from rhodecode.model import meta
 from rhodecode.model.db import RhodeCodeUi, Statistics, Repository
@@ -54,11 +55,7 @@
 
 add_cache(config)
 
-try:
-    import json
-except ImportError:
-    #python 2.5 compatibility
-    import simplejson as json
+
 
 __all__ = ['whoosh_index', 'get_commits_stats',
            'reset_user_password', 'send_email']