kallithea Changeset - 87e9718ab4a2

Changeset - 87e9718ab4a2

Parent rev.

Child rev.

[Not reviewed]

codereview

0 4 0

Marcin Kuzminski - 14 years ago 2012-05-07 22:07:55
marcin@python-works.com

Use webob exception as often as possible

4 files changed with 5 insertions and 5 deletions:

rhodecode/controllers/admin/repos.py

rhodecode/controllers/compare.py

rhodecode/controllers/home.py

rhodecode/controllers/journal.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -19,25 +19,25 @@ @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 import traceback
 import formencode
 from formencode import htmlfill
-from paste.httpexceptions import HTTPInternalServerError
+from webob.exc import HTTPInternalServerError
 from pylons import request, session, tmpl_context as c, url
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 from sqlalchemy.exc import IntegrityError
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
     HasPermissionAnyDecorator, HasRepoPermissionAllDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.utils import invalidate_cache, action_logger, repo_name_slug
 from rhodecode.lib.helpers import get_token
 from rhodecode.model.meta import Session

rhodecode/controllers/compare.py

➞

Show inline comments

@@ @@ -42,26 +42,26 @@ class CompareController(BaseRepoControll @@
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(CompareController, self).__before__()
     def _handle_ref(self, ref):
         """
         Parse the org...other string
         Possible formats are `(branch|book|tag):<name>...(branch|book|tag):<othername>`
         or using a repo <empty>...(repo:</rhodecode/path/to/other)
         :param ref:
         :type ref:
         :param ref: <orginal_reference>...<other_reference>
         :type ref: str
         """
         org_repo = c.rhodecode_repo.name
         def org_parser(org):
             _repo = org_repo
             name, val = org.split(':')
             return _repo, (name, val)
         def other_parser(other):
             _repo = org_repo
             name, val = other.split(':')
             if 'repo' in other:

rhodecode/controllers/home.py

➞

Show inline comments

@@ @@ -17,25 +17,25 @@ @@
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 from pylons import tmpl_context as c, request
-from paste.httpexceptions import HTTPBadRequest
+from webob.exc import HTTPBadRequest
 from rhodecode.lib.auth import LoginRequired
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import Repository
 log = logging.getLogger(__name__)
 class HomeController(BaseController):
     @LoginRequired()
     def __before__(self):

rhodecode/controllers/journal.py

➞

Show inline comments

@@ @@ -21,25 +21,25 @@ @@
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 from itertools import groupby
 from sqlalchemy import or_
 from sqlalchemy.orm import joinedload
 from webhelpers.paginate import Page
 from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed
-from paste.httpexceptions import HTTPBadRequest
+from webob.exc import HTTPBadRequest
 from pylons import request, tmpl_context as c, response, url
 from pylons.i18n.translation import _
 import rhodecode.lib.helpers as h
 from rhodecode.lib.auth import LoginRequired, NotAnonymous
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import UserLog, UserFollowing, Repository, User
 from rhodecode.model.meta import Session
 from sqlalchemy.sql.expression import func
 from rhodecode.model.scm import ScmModel
 log = logging.getLogger(__name__)

0 comments (0 inline, 0 general)