kallithea Changeset - 101e07f82f22

Changeset - 101e07f82f22

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 15 years ago 2010-10-12 13:03:14
marcin@python-works.com

fixes #37 python import on json

2 files changed with 12 insertions and 4 deletions:

rhodecode/controllers/changelog.py

rhodecode/controllers/summary.py

0 comments (0 inline, 0 general)

rhodecode/controllers/changelog.py

➞

Show inline comments

@@ @@ -19,13 +19,17 @@ @@
 # MA  02110-1301, USA.
 """
 Created on April 21, 2010
 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
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.hg_model import HgModel
 from webhelpers.paginate import Page
@@ @@ -66,13 +70,13 @@ class ChangelogController(BaseController @@
         return render('changelog/changelog.html')
     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)
         rev_start = repo.revisions[(-1 * offset)]
         revcount = min(max_rev, revcount)
@@ @@ -83,8 +87,8 @@ class ChangelogController(BaseController @@
         data = []
         for (id, type, ctx, vtx, edges) in tree:
             if type != CHANGESET:
                 continue
             data.append(('', vtx, edges))
         c.jsdata = dumps(data)
+        c.jsdata = json.dumps(data)

rhodecode/controllers/summary.py

➞

Show inline comments

@@ @@ -32,13 +32,17 @@ from webhelpers.paginate import Page @@
 from rhodecode.lib.celerylib import run_task
 from rhodecode.lib.celerylib.tasks import get_commits_stats
 from datetime import datetime, timedelta
 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):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

0 comments (0 inline, 0 general)