Mercurial > kallithea
diff rhodecode/controllers/changelog.py @ 592:0a48c1ec04fc
#37 fixed json imports for python2.5
removed cache manager settings out of meta to ini files
docs update.
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 12 Oct 2010 22:25:25 +0200 |
| parents | 1e757ac98988 |
| children | 79457e03ef68 |
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 22:25:25 2010 +0200 @@ -22,7 +22,7 @@ changelog controller for pylons @author: marcink """ -from json import dumps + 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 @@ -32,6 +32,12 @@ import logging log = logging.getLogger(__name__) +try: + import json +except ImportError: + #python 2.5 compatibility + import simplejson as json + class ChangelogController(BaseController): @LoginRequired() @@ -69,7 +75,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 +92,5 @@ continue data.append(('', vtx, edges)) - c.jsdata = dumps(data) + c.jsdata = json.dumps(data)