Mercurial > kallithea
comparison rhodecode/controllers/summary.py @ 608:101e07f82f22
fixes #37 python import on json
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 12 Oct 2010 13:03:14 +0200 |
parents | b75b77ef649d |
children | 7e536d1af60d |
comparison
equal
deleted
inserted
replaced
591:1e2adb37cab6 | 608:101e07f82f22 |
---|---|
33 from rhodecode.lib.celerylib.tasks import get_commits_stats | 33 from rhodecode.lib.celerylib.tasks import get_commits_stats |
34 from datetime import datetime, timedelta | 34 from datetime import datetime, timedelta |
35 from time import mktime | 35 from time import mktime |
36 import calendar | 36 import calendar |
37 import logging | 37 import logging |
38 import json | 38 try: |
39 import json | |
40 except ImportError: | |
41 #python 2.5 compatibility | |
42 import simplejson as json | |
39 log = logging.getLogger(__name__) | 43 log = logging.getLogger(__name__) |
40 | 44 |
41 class SummaryController(BaseController): | 45 class SummaryController(BaseController): |
42 | 46 |
43 @LoginRequired() | 47 @LoginRequired() |