Merge remote branch 'remotes/aaronw/bug444_fix_utils_py_redux'

Conflicts:
	mediagoblin/util.py
This commit is contained in:
Christopher Allan Webber
2011-10-01 21:27:36 -05:00
37 changed files with 1018 additions and 864 deletions

View File

@@ -21,7 +21,7 @@ import uuid
from werkzeug.utils import secure_filename
from mediagoblin import util
from mediagoblin.tools import common
########
# Errors
@@ -236,5 +236,5 @@ def storage_system_from_config(config_section):
else:
storage_class = 'mediagoblin.storage.filestorage:BasicFileStorage'
storage_class = util.import_component(storage_class)
storage_class = common.import_component(storage_class)
return storage_class(**config_params)