diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-03-29 08:09:36 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-03-29 08:09:36 -0500 |
| commit | 047d8d5871ee8ee97ea52a78512fe5b2da51b8cc (patch) | |
| tree | c8bdf7e4ebb83ee8dd25930459c33084cd434ac6 /mediagoblin/submit/views.py | |
| parent | 6c6e9911f5556bcd1f287afa39d4cc6d14d9c6c1 (diff) | |
| parent | 2ef2f46e73845dcd55666cad49c5a17908bf5b46 (diff) | |
| download | mediagoblin-047d8d5871ee8ee97ea52a78512fe5b2da51b8cc.tar.lz mediagoblin-047d8d5871ee8ee97ea52a78512fe5b2da51b8cc.tar.xz mediagoblin-047d8d5871ee8ee97ea52a78512fe5b2da51b8cc.zip | |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/submit/views.py')
| -rw-r--r-- | mediagoblin/submit/views.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index def7e839..1e47d259 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -22,7 +22,6 @@ import logging _log = logging.getLogger(__name__) -from werkzeug.datastructures import FileStorage from mediagoblin.tools.text import convert_to_tag_list_of_dicts from mediagoblin.tools.translate import pass_to_ugettext as _ @@ -32,7 +31,8 @@ from mediagoblin.submit import forms as submit_forms from mediagoblin.messages import add_message, SUCCESS from mediagoblin.media_types import sniff_media, \ InvalidFileType, FileTypeNotSupported -from mediagoblin.submit.lib import run_process_media, prepare_queue_task +from mediagoblin.submit.lib import check_file_field, prepare_queue_task, \ + run_process_media @require_active_login @@ -44,9 +44,7 @@ def submit_start(request): license=request.user.license_preference) if request.method == 'POST' and submit_form.validate(): - if not ('file' in request.files - and isinstance(request.files['file'], FileStorage) - and request.files['file'].stream): + if not check_file_field(request, 'file'): submit_form.file.errors.append( _(u'You must provide a file.')) else: |