renaming storage_system_from_paste_config()->storage_system_from_config()

As Elrond points out, this name doesn't make sense anymore since this
isn't based on the paste config.  Thanks Elrond!

diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index d2a0695ebdfee555248a736d022ee84313467656..b27b5761c1482c39cedb1847dfad67958ed1d96d 100644 (file)
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -75,9 +75,9 @@ class MediaGoblinApp(object):
             app_config.get('user_template_path'))
         
         # Set up storage systems
-        self.public_store = storage.storage_system_from_paste_config(
+        self.public_store = storage.storage_system_from_config(
             app_config, 'publicstore')
-        self.queue_store = storage.storage_system_from_paste_config(
+        self.queue_store = storage.storage_system_from_config(
             app_config, 'queuestore')
 
         # set up routing

diff --git a/mediagoblin/storage.py b/mediagoblin/storage.py
index ba6ac0173d5d46811e64ca9e217b5409f469eba6..5d6faa4cd7a78da5144865b78e466291462b36d7 100644 (file)
--- a/mediagoblin/storage.py
+++ b/mediagoblin/storage.py
@@ -247,7 +247,7 @@ def clean_listy_filepath(listy_filepath):
     return cleaned_filepath
 
 
-def storage_system_from_paste_config(paste_config, storage_prefix):
+def storage_system_from_config(paste_config, storage_prefix):
     """
     Utility for setting up a storage system from the paste app config.
 
@@ -266,7 +266,7 @@ def storage_system_from_paste_config(paste_config, storage_prefix):
       An instantiated storage system.
 
     Example:
-      storage_system_from_paste_config(
+      storage_system_from_config(
         {'publicstore_base_url': '/media/',
          'publicstore_base_dir': '/var/whatever/media/'},
         'publicstore')

diff --git a/mediagoblin/tests/test_storage.py b/mediagoblin/tests/test_storage.py
index 55b66e84ea990e758025cb5590d5da3be63ed9d0..1800c29de887bbdaed75b1aaead76d814c598cf3 100644 (file)
--- a/mediagoblin/tests/test_storage.py
+++ b/mediagoblin/tests/test_storage.py
@@ -58,8 +58,8 @@ class FakeRemoteStorage(storage.BasicFileStorage):
     local_storage = False
 
 
-def test_storage_system_from_paste_config():
-    this_storage = storage.storage_system_from_paste_config(
+def test_storage_system_from_config():
+    this_storage = storage.storage_system_from_config(
         {'somestorage_base_url': 'http://example.org/moodia/',
          'somestorage_base_dir': '/tmp/',
          'somestorage_garbage_arg': 'garbage_arg',
@@ -69,7 +69,7 @@ def test_storage_system_from_paste_config():
     assert this_storage.base_dir == '/tmp/'
     assert this_storage.__class__ is storage.BasicFileStorage
 
-    this_storage = storage.storage_system_from_paste_config(
+    this_storage = storage.storage_system_from_config(
         {'somestorage_foobie': 'eiboof',
          'somestorage_blech': 'hcelb',
          'somestorage_garbage_arg': 'garbage_arg',