Storage config: Drop all Backward Compatibility

Chris Webber says not to care about backward compatibility
at this stage. So drop the last bits.

diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py
index 32f0194cc5dabf522f336dc6ac124a5eef8255db..44f604b1c95f5b89fe45fc58fafb8191d74dbe5b 100644 (file)
--- a/mediagoblin/init/__init__.py
+++ b/mediagoblin/init/__init__.py
@@ -112,16 +112,15 @@ def get_staticdirector(app_config):
 
 
 def setup_storage():
-    app_config = mg_globals.app_config
     global_config = mg_globals.global_config
 
     key_short = 'publicstore'
     key_long = "storage:" + key_short
-    public_store = storage_system_from_config(global_config[key_long], None)
+    public_store = storage_system_from_config(global_config[key_long])
 
     key_short = 'queuestore'
     key_long = "storage:" + key_short
-    queue_store = storage_system_from_config(global_config[key_long], None)
+    queue_store = storage_system_from_config(global_config[key_long])
 
     setup_globals(
         public_store = public_store,

diff --git a/mediagoblin/storage.py b/mediagoblin/storage.py
index 46a0c040355397e9ddf8a5367035d8f770dab448..66acc1d47ad08cdfe79bc93df0a7c5ae9a71cdf0 100644 (file)
--- a/mediagoblin/storage.py
+++ b/mediagoblin/storage.py
@@ -443,7 +443,7 @@ def clean_listy_filepath(listy_filepath):
     return cleaned_filepath
 
 
-def storage_system_from_config(paste_config, storage_prefix):
+def storage_system_from_config(config):
     """
     Utility for setting up a storage system from the paste app config.
 
@@ -472,15 +472,9 @@ def storage_system_from_config(paste_config, storage_prefix):
            base_url='/media/',
            base_dir='/var/whatever/media')
     """
-    if storage_prefix is not None:
-        prefix_re = re.compile('^%s_(.+)$' % re.escape(storage_prefix))
-    else:
-        prefix_re = re.compile('^(.+)$')
-
-    config_params = dict(
-        [(prefix_re.match(key).groups()[0], value)
-         for key, value in paste_config.iteritems()
-         if prefix_re.match(key)])
+    # This construct is needed, because dict(config) does
+    # not replace the variables in the config items.
+    config_params = dict(config.iteritems())
 
     if 'storage_class' in config_params:
         storage_class = config_params['storage_class']