Fixing check_filetype...

We need to check the first part of the guess_type returned tuple, and
also this try: except: doesn't belong here, so killing.

diff --git a/mediagoblin/submit/security.py b/mediagoblin/submit/security.py
index 5a06a499683058cb0809c85f29c11e5ab400a954..b2cb6d88a6acddfecbf96e1c88dac40ade80a352 100644 (file)
--- a/mediagoblin/submit/security.py
+++ b/mediagoblin/submit/security.py
@@ -16,19 +16,11 @@
 
 from mimetypes import guess_type
 
-from Image import open as image_open
 
 ALLOWED = ['image/jpeg', 'image/png', 'image/tiff', 'image/gif']
 
 def check_filetype(posted_file):
-    if not guess_type(posted_file.filename) in ALLOWED:
-        return False
-
-    # TODO: This should be handled by the processing stage.  We should
-    # handle error detection there.
-    try:
-        image = image_open(posted_file.file)
-    except IOError:
+    if not guess_type(posted_file.filename)[0] in ALLOWED:
         return False
 
     return True