aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/storage.py
diff options
context:
space:
mode:
authorcfdv <caldavis@gmail.com>2011-06-19 17:20:23 -0500
committercfdv <caldavis@gmail.com>2011-06-19 17:20:23 -0500
commitcd95cb6d3d6ffa403be5f2b347862929917aa1e3 (patch)
tree07c7625b589437c927bc0eaa9ed4cdc27f9257d5 /mediagoblin/storage.py
parent699b5475806c43af339d48408a7ea04ae9027c1a (diff)
parent188240e312b8c5ff50bef276c97b36e5b3835f1e (diff)
downloadmediagoblin-cd95cb6d3d6ffa403be5f2b347862929917aa1e3.tar.lz
mediagoblin-cd95cb6d3d6ffa403be5f2b347862929917aa1e3.tar.xz
mediagoblin-cd95cb6d3d6ffa403be5f2b347862929917aa1e3.zip
Merge remote-tracking branch 'origin/master' into is315
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')