diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-10-01 21:27:36 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-10-01 21:27:36 -0500 |
| commit | b43b17fc2686f5524413a66f8e98f3ab0cc11a60 (patch) | |
| tree | 36fb9cf3155a2ff715b1e93f29be6a17cb2113e9 /mediagoblin/storage | |
| parent | e27396802caaab9a939c56d19c991339157c493f (diff) | |
| parent | 91e42c467d898ef70dec2d2d34e4173ea771d2ed (diff) | |
| download | mediagoblin-b43b17fc2686f5524413a66f8e98f3ab0cc11a60.tar.lz mediagoblin-b43b17fc2686f5524413a66f8e98f3ab0cc11a60.tar.xz mediagoblin-b43b17fc2686f5524413a66f8e98f3ab0cc11a60.zip | |
Merge remote branch 'remotes/aaronw/bug444_fix_utils_py_redux'
Conflicts:
mediagoblin/util.py
Diffstat (limited to 'mediagoblin/storage')
| -rw-r--r-- | mediagoblin/storage/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/storage/__init__.py b/mediagoblin/storage/__init__.py index 8665d9e5..9e592b9e 100644 --- a/mediagoblin/storage/__init__.py +++ b/mediagoblin/storage/__init__.py @@ -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) |