Pull changes and resolve merge conflict.

6 files changed, 5 insertions, 29 deletions

diff --git a/mediagoblin/media_types/ascii/__init__.py b/mediagoblin/media_types/ascii/__init__.py
index b0f7551d..1ee44988 100644
--- a/mediagoblin/media_types/ascii/__init__.py
+++ b/mediagoblin/media_types/ascii/__init__.py
@@ -17,16 +17,11 @@
 from mediagoblin.media_types import MediaManagerBase
 from mediagoblin.media_types.ascii.processing import AsciiProcessingManager, \
     sniff_handler
-from mediagoblin.tools import pluginapi
 
 ACCEPTED_EXTENSIONS = ["txt", "asc", "nfo"]
 MEDIA_TYPE = 'mediagoblin.media_types.ascii'
 
 
-def setup_plugin():
-    config = pluginapi.get_config(MEDIA_TYPE)
-
-
 class ASCIIMediaManager(MediaManagerBase):
     human_readable = "ASCII"
     display_template = "mediagoblin/media_displays/ascii.html"
@@ -39,7 +34,6 @@ def get_media_type_and_manager(ext):
 
 
 hooks = {
-    'setup': setup_plugin,
     'get_media_type_and_manager': get_media_type_and_manager,
     ('media_manager', MEDIA_TYPE): lambda: ASCIIMediaManager,
     ('reprocess_manager', MEDIA_TYPE): lambda: AsciiProcessingManager,
diff --git a/mediagoblin/media_types/image/__init__.py b/mediagoblin/media_types/image/__init__.py
index 380304e6..f5b49f01 100644
--- 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,
diff --git a/mediagoblin/media_types/pdf/__init__.py b/mediagoblin/media_types/pdf/__init__.py
index bc5c373b..de70389e 100644
--- a/mediagoblin/media_types/pdf/__init__.py
+++ b/mediagoblin/media_types/pdf/__init__.py
@@ -17,16 +17,12 @@
 from mediagoblin.media_types import MediaManagerBase
 from mediagoblin.media_types.pdf.processing import PdfProcessingManager, \
     sniff_handler
-from mediagoblin.tools import pluginapi
+
 
 ACCEPTED_EXTENSIONS = ['pdf']
 MEDIA_TYPE = 'mediagoblin.media_types.pdf'
 
 
-def setup_plugin():
-    config = pluginapi.get_config(MEDIA_TYPE)
-
-
 class PDFMediaManager(MediaManagerBase):
     human_readable = "PDF"
     display_template = "mediagoblin/media_displays/pdf.html"
@@ -39,7 +35,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: PDFMediaManager,
diff --git a/mediagoblin/media_types/stl/__init__.py b/mediagoblin/media_types/stl/__init__.py
index 7170a45b..d5b56b4b 100644
--- a/mediagoblin/media_types/stl/__init__.py
+++ b/mediagoblin/media_types/stl/__init__.py
@@ -17,16 +17,12 @@
 from mediagoblin.media_types import MediaManagerBase
 from mediagoblin.media_types.stl.processing import StlProcessingManager, \
     sniff_handler
-from mediagoblin.tools import pluginapi
+
 
 MEDIA_TYPE = 'mediagoblin.media_types.stl'
 ACCEPTED_EXTENSIONS = ["obj", "stl"]
 
 
-def setup_plugin():
-    config = pluginapi.get_config(MEDIA_TYPE)
-
-
 class STLMediaManager(MediaManagerBase):
     human_readable = "stereo lithographics"
     display_template = "mediagoblin/media_displays/stl.html"
@@ -38,7 +34,6 @@ def get_media_type_and_manager(ext):
         return MEDIA_TYPE, STLMediaManager
 
 hooks = {
-    'setup': setup_plugin,
     'get_media_type_and_manager': get_media_type_and_manager,
     'sniff_handler': sniff_handler,
     ('media_manager', MEDIA_TYPE): lambda: STLMediaManager,
diff --git a/mediagoblin/media_types/video/__init__.py b/mediagoblin/media_types/video/__init__.py
index 0ed19d1b..c85cc0b2 100644
--- a/mediagoblin/media_types/video/__init__.py
+++ b/mediagoblin/media_types/video/__init__.py
@@ -17,17 +17,13 @@
 from mediagoblin.media_types import MediaManagerBase
 from mediagoblin.media_types.video.processing import VideoProcessingManager, \
     sniff_handler
-from mediagoblin.tools import pluginapi
+
 
 MEDIA_TYPE = 'mediagoblin.media_types.video'
 ACCEPTED_EXTENSIONS = [
         "mp4", "mov", "webm", "avi", "3gp", "3gpp", "mkv", "ogv", "m4v"]
 
 
-def setup_plugin():
-    config = pluginapi.get_config(MEDIA_TYPE)
-
-
 class VideoMediaManager(MediaManagerBase):
     human_readable = "Video"
     display_template = "mediagoblin/media_displays/video.html"
@@ -43,7 +39,6 @@ def get_media_type_and_manager(ext):
         return MEDIA_TYPE, VideoMediaManager
 
 hooks = {
-    'setup': setup_plugin,
     'get_media_type_and_manager': get_media_type_and_manager,
     'sniff_handler': sniff_handler,
     ('media_manager', MEDIA_TYPE): lambda: VideoMediaManager,
diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py
index ed224251..506c7501 100644
--- a/mediagoblin/media_types/video/processing.py
+++ b/mediagoblin/media_types/video/processing.py
@@ -223,7 +223,7 @@ class CommonVideoProcessor(MediaProcessor):
                                      '{basename}.thumbnail.jpg'))
 
         if not thumb_size:
-            thumb_size = (mgg.global_config['media:thumb']['max_width'])
+            thumb_size = (mgg.global_config['media:thumb']['max_width'],)
 
         # We will only use the width so that the correct scale is kept
         transcoders.VideoThumbnailerMarkII(