added openid docs

[mediagoblin.git] / mediagoblin / gmg_commands / import_export.py

diff --git a/mediagoblin/gmg_commands/import_export.py b/mediagoblin/gmg_commands/import_export.py
index 20cc8fe42114379ca435f2c60a392268d1f56c9e..d51a1e3e66e2dcc4f6307b80b10a0d6bcb5d3216 100644 (file)
--- a/mediagoblin/gmg_commands/import_export.py
+++ b/mediagoblin/gmg_commands/import_export.py
@@ -61,13 +61,12 @@ def _import_media(db, args):
         args._cache_path['media'])
 
     # TODO: Add import of queue files
-    queue_cache = BasicFileStorage(
-        args._cache_path['queue'])
+    queue_cache = BasicFileStorage(args._cache_path['queue'])
 
     for entry in db.MediaEntry.find():
         for name, path in entry.media_files.items():
             _log.info('Importing: {0} - {1}'.format(
-                    entry.title,
+                    entry.title.encode('ascii', 'replace'),
                     name))
 
             media_file = mg_globals.public_store.get_file(path, mode='wb')
@@ -106,7 +105,7 @@ def env_import(args):
     setup_storage()
 
     global_config, app_config = setup_global_and_app_config(args.conf_file)
-    connection, db = setup_connection_and_db_from_config(
+    db = setup_connection_and_db_from_config(
         app_config)
 
     tf = tarfile.open(
@@ -203,8 +202,7 @@ def _export_media(db, args):
         args._cache_path['media'])
 
     # TODO: Add export of queue files
-    queue_cache = BasicFileStorage(
-        args._cache_path['queue'])
+    queue_cache = BasicFileStorage(args._cache_path['queue'])
 
     for entry in db.MediaEntry.find():
         for name, path in entry.media_files.items():
@@ -245,8 +243,7 @@ def env_export(args):
 
     setup_storage()
 
-    connection, db = setup_connection_and_db_from_config(
-        app_config)
+    db = setup_connection_and_db_from_config(app_config)
 
     _export_database(db, args)