comparison rhodecode/controllers/admin/repos_groups.py @ 3705:f37d7514e7ab beta

always use json from compat module
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 07 Apr 2013 19:55:30 +0200
parents 4c78a0855a17
children 7e3d89d9d3a2
comparison
equal deleted inserted replaced
3703:4839bc1d89fa 3705:f37d7514e7ab
35 35
36 from sqlalchemy.exc import IntegrityError 36 from sqlalchemy.exc import IntegrityError
37 37
38 import rhodecode 38 import rhodecode
39 from rhodecode.lib import helpers as h 39 from rhodecode.lib import helpers as h
40 from rhodecode.lib.ext_json import json 40 from rhodecode.lib.compat import json
41 from rhodecode.lib.auth import LoginRequired, HasPermissionAnyDecorator,\ 41 from rhodecode.lib.auth import LoginRequired, HasPermissionAnyDecorator,\
42 HasReposGroupPermissionAnyDecorator, HasReposGroupPermissionAll,\ 42 HasReposGroupPermissionAnyDecorator, HasReposGroupPermissionAll,\
43 HasPermissionAll 43 HasPermissionAll
44 from rhodecode.lib.base import BaseController, render 44 from rhodecode.lib.base import BaseController, render
45 from rhodecode.model.db import RepoGroup, Repository 45 from rhodecode.model.db import RepoGroup, Repository