From db07cbef475af3b9991a8bec62e4ea7749650e5e Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Wed, 5 Dec 2012 17:32:56 +0100 Subject: fixed issue #671 commenting on pull requests sometimes used old JSON encoder and broke. This changeset replaces it's with RhodeCode json encoder to ensure all data is properly serializable --HG-- branch : beta --- rhodecode/controllers/changeset.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'rhodecode/controllers/changeset.py') diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py index 1fd01902..68a21d37 100644 --- a/rhodecode/controllers/changeset.py +++ b/rhodecode/controllers/changeset.py @@ -31,11 +31,10 @@ from webob.exc import HTTPForbidden, HTTPBadRequest from pylons import tmpl_context as c, url, request, response from pylons.i18n.translation import _ from pylons.controllers.util import redirect -from pylons.decorators import jsonify +from rhodecode.lib.utils import jsonify -from rhodecode.lib.vcs.exceptions import RepositoryError, ChangesetError, \ +from rhodecode.lib.vcs.exceptions import RepositoryError, \ ChangesetDoesNotExistError -from rhodecode.lib.vcs.nodes import FileNode import rhodecode.lib.helpers as h from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator @@ -47,8 +46,8 @@ from rhodecode.model.db import ChangesetComment, ChangesetStatus from rhodecode.model.comment import ChangesetCommentsModel from rhodecode.model.changeset_status import ChangesetStatusModel from rhodecode.model.meta import Session -from rhodecode.lib.diffs import LimitedDiffContainer from rhodecode.model.repo import RepoModel +from rhodecode.lib.diffs import LimitedDiffContainer from rhodecode.lib.exceptions import StatusChangeOnClosedPullRequestError from rhodecode.lib.vcs.backends.base import EmptyChangeset from rhodecode.lib.utils2 import safe_unicode -- cgit v1.2.3