Pull changes and resolve merge conflict.

[mediagoblin.git] / mediagoblin / media_types / image / __init__.py

diff --git a/mediagoblin/media_types/image/__init__.py b/mediagoblin/media_types/image/__init__.py
index 380304e6456ee93b23e9c4ef06cdb72291e251be..f5b49f018ee82096390cd629b43776d666a48c0a 100644 (file)
--- a/mediagoblin/media_types/image/__init__.py
+++ b/mediagoblin/media_types/image/__init__.py
@@ -19,7 +19,7 @@ import logging
 from mediagoblin.media_types import MediaManagerBase
 from mediagoblin.media_types.image.processing import sniff_handler, \
         ImageProcessingManager
-from mediagoblin.tools import pluginapi
+
 
 _log = logging.getLogger(__name__)
 
@@ -27,11 +27,9 @@ _log = logging.getLogger(__name__)
 ACCEPTED_EXTENSIONS = ["jpg", "jpeg", "png", "gif", "tiff"]
 MEDIA_TYPE = 'mediagoblin.media_types.image'
 
-
 def setup_plugin():
     config = pluginapi.get_config(MEDIA_TYPE)
 
-
 class ImageMediaManager(MediaManagerBase):
     human_readable = "Image"
     display_template = "mediagoblin/media_displays/image.html"
@@ -67,7 +65,6 @@ def get_media_type_and_manager(ext):
 
 
 hooks = {
-    'setup': setup_plugin,
     'get_media_type_and_manager': get_media_type_and_manager,
     'sniff_handler': sniff_handler,
     ('media_manager', MEDIA_TYPE): lambda: ImageMediaManager,