Rename get_all_posts_of_a_blog function.

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

diff --git a/mediagoblin/media_types/__init__.py b/mediagoblin/media_types/__init__.py
index 2ce66f2a3ceb8146218e7d881f7e123eda12da92..134157dcb0ca7054fdf5043bef82548137ef7373 100644 (file)
--- a/mediagoblin/media_types/__init__.py
+++ b/mediagoblin/media_types/__init__.py
@@ -50,36 +50,6 @@ class MediaManagerBase(object):
         return hasattr(self, i)
 
 
-class CompatMediaManager(object):
-    def __init__(self, mm_dict, entry=None):
-        self.mm_dict = mm_dict
-        self.entry = entry
-
-    def __call__(self, entry):
-        "So this object can look like a class too, somehow"
-        assert self.entry is None
-        return self.__class__(self.mm_dict, entry)
-
-    def __getitem__(self, i):
-        return self.mm_dict[i]
-
-    def __contains__(self, i):
-        return (i in self.mm_dict)
-
-    @property
-    def media_fetch_order(self):
-        return self.mm_dict.get('media_fetch_order')
-
-    def sniff_handler(self, *args, **kwargs):
-        func = self.mm_dict.get("sniff_handler", None)
-        if func is not None:
-            return func(*args, **kwargs)
-        return False
-
-    def __getattr__(self, i):
-        return self.mm_dict[i]
-
-
 def sniff_media(media):
     '''
     Iterate through the enabled media types and find those suited
@@ -99,7 +69,7 @@ def sniff_media(media):
         media_type = hook_handle('sniff_handler', media_file, media=media)
         if media_type:
             _log.info('{0} accepts the file'.format(media_type))
-            return media_type, hook_handle('get_media_managers', media_type)
+            return media_type, hook_handle(('media_manager', media_type))
         else:
             _log.debug('{0} did not accept the file'.format(media_type))