aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/gmg_commands/import_export.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-09-14 04:57:19 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-09-14 04:57:19 -0500
commit9122a9d047765574bb0d11436522a6c868da86cc (patch)
tree7a1799958c41cdcb388692d5e894c82f8a5667c4 /mediagoblin/gmg_commands/import_export.py
parent8c12e57b9e0db109e0fc3211ec1a8145ef3d3eb1 (diff)
parentfd10c71644f12b0a56247c782566af1c37df5851 (diff)
downloadmediagoblin-9122a9d047765574bb0d11436522a6c868da86cc.tar.lz
mediagoblin-9122a9d047765574bb0d11436522a6c868da86cc.tar.xz
mediagoblin-9122a9d047765574bb0d11436522a6c868da86cc.zip
Merge remote branch 'remotes/jwandborg/f587-split_storage_into_submodules'
Diffstat (limited to 'mediagoblin/gmg_commands/import_export.py')
-rw-r--r--mediagoblin/gmg_commands/import_export.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/gmg_commands/import_export.py b/mediagoblin/gmg_commands/import_export.py
index fc5c88a8..05edbfc8 100644
--- a/mediagoblin/gmg_commands/import_export.py
+++ b/mediagoblin/gmg_commands/import_export.py
@@ -17,7 +17,7 @@
from mediagoblin import mg_globals
from mediagoblin.db.open import setup_connection_and_db_from_config
from mediagoblin.init.config import read_mediagoblin_config
-from mediagoblin.storage import BasicFileStorage
+from mediagoblin.storage.filestorage import BasicFileStorage
from mediagoblin.init import setup_storage, setup_global_and_app_config
import shutil