Mercurial > kallithea
changeset 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 | 1e2adb37cab6 |
| children | c1c1cf772337 |
| files | rhodecode/controllers/changelog.py rhodecode/controllers/summary.py |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/changelog.py Mon Oct 11 19:18:05 2010 +0200 +++ b/rhodecode/controllers/changelog.py Tue Oct 12 13:03:14 2010 +0200 @@ -22,7 +22,11 @@ changelog controller for pylons @author: marcink """ -from json import dumps +try: + import json +except ImportError: + #python 2.5 compatibility + import simplejson as json from mercurial.graphmod import colored, CHANGESET, revisions as graph_rev from pylons import request, session, tmpl_context as c from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator @@ -69,7 +73,7 @@ def _graph(self, repo, size, p): revcount = size - if not repo.revisions:return dumps([]), 0 + if not repo.revisions:return json.dumps([]), 0 max_rev = repo.revisions[-1] offset = 1 if p == 1 else ((p - 1) * revcount + 1) @@ -86,5 +90,5 @@ continue data.append(('', vtx, edges)) - c.jsdata = dumps(data) + c.jsdata = json.dumps(data)
--- a/rhodecode/controllers/summary.py Mon Oct 11 19:18:05 2010 +0200 +++ b/rhodecode/controllers/summary.py Tue Oct 12 13:03:14 2010 +0200 @@ -35,7 +35,11 @@ from time import mktime import calendar import logging -import json +try: + import json +except ImportError: + #python 2.5 compatibility + import simplejson as json log = logging.getLogger(__name__) class SummaryController(BaseController):