aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/decorators.py
diff options
context:
space:
mode:
authorSebastian Spaeth <Sebastian@SSpaeth.de>2012-12-23 11:58:51 +0100
committerSebastian Spaeth <Sebastian@SSpaeth.de>2012-12-23 11:58:51 +0100
commitcfa922295e5ddfaab336a3c2c0403422f77758b6 (patch)
treef24dcebc6214e2804646c04ff801886b8a11c4b5 /mediagoblin/decorators.py
parent785b287fcb42ac9130b222006097e3f68cec3543 (diff)
downloadmediagoblin-cfa922295e5ddfaab336a3c2c0403422f77758b6.tar.lz
mediagoblin-cfa922295e5ddfaab336a3c2c0403422f77758b6.tar.xz
mediagoblin-cfa922295e5ddfaab336a3c2c0403422f77758b6.zip
Convert return HttpException to raise HttpException
controllers (view function) raise HttpException's and do not return them. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'mediagoblin/decorators.py')
-rw-r--r--mediagoblin/decorators.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index e45d3272..0903dd41 100644
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@ -74,7 +74,7 @@ def user_may_delete_media(controller):
{'id': ObjectId(request.matchdict['media'])}).uploader
if not (request.user.is_admin or
request.user.id == uploader_id):
- return Forbidden()
+ raise Forbidden()
return controller(request, *args, **kwargs)
@@ -91,7 +91,7 @@ def user_may_alter_collection(controller):
{'username': request.matchdict['user']}).id
if not (request.user.is_admin or
request.user.id == creator_id):
- return Forbidden()
+ raise Forbidden()
return controller(request, *args, **kwargs)