diff options
| author | Aaron Williamson <aaron@copiesofcopies.org> | 2011-10-03 20:01:14 -0400 |
|---|---|---|
| committer | Aaron Williamson <aaron@copiesofcopies.org> | 2011-10-03 20:01:14 -0400 |
| commit | 43199340a25ab0aa252796f1c865e9ebf0e96649 (patch) | |
| tree | 36ce24fa3992d4646d2c7835399e2eddc55f7612 /mediagoblin/storage/__init__.py | |
| parent | 3b74ce94ff90e0bd5b214891becb62a6fc503434 (diff) | |
| parent | 4d7a93a49303344830021bab5a741148b1adb7c3 (diff) | |
| download | mediagoblin-43199340a25ab0aa252796f1c865e9ebf0e96649.tar.lz mediagoblin-43199340a25ab0aa252796f1c865e9ebf0e96649.tar.xz mediagoblin-43199340a25ab0aa252796f1c865e9ebf0e96649.zip | |
Fixed conflict in /auth/views.py.
Diffstat (limited to 'mediagoblin/storage/__init__.py')
| -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) |