aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoar Wandborg <joar@wandborg.se>2013-02-26 23:57:20 +0100
committerJoar Wandborg <joar@wandborg.se>2013-02-27 00:30:51 +0100
commit6bdf9a104428543840c4967ac21518af3dc60bea (patch)
tree24e249b97668423904437bea25457d7a7bc1b209
parent443dcf867c0effb3d7e96b351aea4dd665852024 (diff)
downloadmediagoblin-6bdf9a104428543840c4967ac21518af3dc60bea.tar.lz
mediagoblin-6bdf9a104428543840c4967ac21518af3dc60bea.tar.xz
mediagoblin-6bdf9a104428543840c4967ac21518af3dc60bea.zip
Allow media managers without sniff_handler
-rw-r--r--mediagoblin/media_types/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/media_types/__init__.py b/mediagoblin/media_types/__init__.py
index 06763510..0abb38d3 100644
--- a/mediagoblin/media_types/__init__.py
+++ b/mediagoblin/media_types/__init__.py
@@ -49,7 +49,8 @@ def sniff_media(media):
for media_type, manager in get_media_managers():
_log.info('Sniffing {0}'.format(media_type))
- if manager['sniff_handler'](media_file, media=media):
+ if 'sniff_handler' in manager and \
+ manager['sniff_handler'](media_file, media=media):
_log.info('{0} accepts the file'.format(media_type))
return media_type, manager
else: