diff options
author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2012-11-15 16:55:15 +0100 |
---|---|---|
committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2012-12-21 08:11:40 +0100 |
commit | 62d14bf50baf45ac15fe5276be74b073de880f77 (patch) | |
tree | 276c420216440323485f85c4040592a764e374fc /mediagoblin/plugins/api/views.py | |
parent | 059eaee4dfa40e3c2e67b7d638f49955b68d9c31 (diff) | |
download | mediagoblin-62d14bf50baf45ac15fe5276be74b073de880f77.tar.lz mediagoblin-62d14bf50baf45ac15fe5276be74b073de880f77.tar.xz mediagoblin-62d14bf50baf45ac15fe5276be74b073de880f77.zip |
Transition webob.HttpForbidden to webob's exceptions Forbidden
Also the BadRequest exception.
Diffstat (limited to 'mediagoblin/plugins/api/views.py')
-rw-r--r-- | mediagoblin/plugins/api/views.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mediagoblin/plugins/api/views.py b/mediagoblin/plugins/api/views.py index 7f93108e..39f864c4 100644 --- a/mediagoblin/plugins/api/views.py +++ b/mediagoblin/plugins/api/views.py @@ -19,7 +19,8 @@ import logging import uuid from os.path import splitext -from webob import exc, Response +from webob import Response +from werkzeug.exceptions import BadRequest, Forbidden from werkzeug.utils import secure_filename from werkzeug.datastructures import FileStorage from celery import registry @@ -47,13 +48,13 @@ def post_entry(request): if request.method != 'POST': _log.debug('Must POST against post_entry') - return exc.HTTPBadRequest() + return BadRequest() if not 'file' in request.files \ or not isinstance(request.files['file'], FileStorage) \ or not request.files['file'].stream: _log.debug('File field not found') - return exc.HTTPBadRequest() + return BadRequest() media_file = request.files['file'] @@ -129,7 +130,7 @@ def post_entry(request): @api_auth def api_test(request): if not request.user: - return exc.HTTPForbidden() + return Forbidden() user_data = { 'username': request.user.username, |