aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/submit/views.py
diff options
context:
space:
mode:
authorJoar Wandborg <git@wandborg.com>2011-12-31 22:57:08 +0100
committerJoar Wandborg <git@wandborg.com>2011-12-31 22:57:08 +0100
commit4601c30c2e80734cf3a18472c2e29a7f920b9604 (patch)
treec4f3c63f8eb306a435c6e15cb21a6168ecfdf1b8 /mediagoblin/submit/views.py
parenteab23e38d0d4b3a95d6cbb9527715e82efaccdd6 (diff)
downloadmediagoblin-4601c30c2e80734cf3a18472c2e29a7f920b9604.tar.lz
mediagoblin-4601c30c2e80734cf3a18472c2e29a7f920b9604.tar.xz
mediagoblin-4601c30c2e80734cf3a18472c2e29a7f920b9604.zip
Fixed submission error handling and broken tests
- Fixed broken test_auth test - Fixed error handling on submission, it now raises the exception if it is not explicitly relevant to file submission.
Diffstat (limited to 'mediagoblin/submit/views.py')
-rw-r--r--mediagoblin/submit/views.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index 443d0e52..60693bd6 100644
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -31,7 +31,8 @@ from mediagoblin.decorators import require_active_login
from mediagoblin.submit import forms as submit_forms, security
from mediagoblin.processing import mark_entry_failed, ProcessMedia
from mediagoblin.messages import add_message, SUCCESS
-from mediagoblin.media_types import get_media_type_and_manager, InvalidFileType
+from mediagoblin.media_types import get_media_type_and_manager, \
+ InvalidFileType, FileTypeNotSupported
@require_active_login
@@ -133,8 +134,13 @@ def submit_start(request):
This section is intended to catch exceptions raised in
mediagobling.media_types
'''
- submit_form.file.errors.append(
- e)
+
+ if isinstance(e, InvalidFileType) or \
+ isinstance(e, FileTypeNotSupported):
+ submit_form.file.errors.append(
+ e)
+ else:
+ raise
return render_to_response(
request,