Merge remote branch 'remotes/gandaro/324-bad-media-types'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 6 Jun 2011 12:51:17 +0000 (07:51 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 6 Jun 2011 12:51:17 +0000 (07:51 -0500)
1  2 
mediagoblin/submit/views.py

index b409b64d24e1eabe305acab76e868acdd0f612ab,5ddf992fd8ca6e0f438d8f3f7a346f639c1e8a37..e9b5c37e0c4b4af2168141e7430eeaee114309b2
  from os.path import splitext
  from cgi import FieldStorage
  
 -from webob import Response, exc
  from werkzeug.utils import secure_filename
  
 +from mediagoblin.util import render_to_response, redirect
  from mediagoblin.decorators import require_active_login
- from mediagoblin.submit import forms as submit_forms
+ from mediagoblin.submit import forms as submit_forms, security
  from mediagoblin.process_media import process_media_initial