aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/storage.py
diff options
context:
space:
mode:
authorJef van Schendel <jefvanschendel@gmail.com>2011-06-20 16:33:14 +0200
committerJef van Schendel <jefvanschendel@gmail.com>2011-06-20 16:33:14 +0200
commit2d1f91cc41aca908502ea1d18687b902a5fd90a1 (patch)
tree1d6d425a8ec7a7bfb8490c88d87806d856336d1e /mediagoblin/storage.py
parent76e21adbd8756159d83bef99b335398519b338f3 (diff)
parent5c441e75ebc4ad63c3a5362d9bc451abe97984d2 (diff)
downloadmediagoblin-2d1f91cc41aca908502ea1d18687b902a5fd90a1.tar.lz
mediagoblin-2d1f91cc41aca908502ea1d18687b902a5fd90a1.tar.xz
mediagoblin-2d1f91cc41aca908502ea1d18687b902a5fd90a1.zip
Merge remote-tracking branch 'gitorious/master'
Diffstat (limited to 'mediagoblin/storage.py')
-rw-r--r--mediagoblin/storage.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/storage.py b/mediagoblin/storage.py
index ba6ac017..5d6faa4c 100644
--- 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')