aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/storage.py
diff options
context:
space:
mode:
authorcfdv <caldavis@gmail.com>2011-06-19 17:39:32 -0500
committercfdv <caldavis@gmail.com>2011-06-19 17:39:32 -0500
commit0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada (patch)
tree7a0936a9a83f9f39a090f96e41a274ac77ddaee4 /mediagoblin/storage.py
parente8fda91bc2326911ea9a0197e595bc333540c282 (diff)
parent188240e312b8c5ff50bef276c97b36e5b3835f1e (diff)
downloadmediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.tar.lz
mediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.tar.xz
mediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.zip
Merge branch 'is330', remote-tracking branch 'origin/master' into is330
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')