From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Tue, 15 Nov 2011 10:21:15 +0000 (+0100)
Subject: export: Handle Unicode titles better in logging
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a9c7af90408c3537f42763e63862a2ae44bcc368;p=mediagoblin.git

export: Handle Unicode titles better in logging

log("ascii %s" % unicode_string) tries to convert unicode
to ascii, which might fail.

Better use log(u"unicode format %s" % unicode_string) and
let the logging framework handle the conversion. This works
much better and the exceptions still happening aren't
stopping the main app.

Also remove one useless import.
---

diff --git a/mediagoblin/gmg_commands/import_export.py b/mediagoblin/gmg_commands/import_export.py
index a46219a0..30112969 100644
--- a/mediagoblin/gmg_commands/import_export.py
+++ b/mediagoblin/gmg_commands/import_export.py
@@ -16,7 +16,6 @@
 
 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.filestorage import BasicFileStorage
 from mediagoblin.init import setup_storage, setup_global_and_app_config
 
@@ -209,7 +208,7 @@ def _export_media(db, args):
 
     for entry in db.media_entries.find():
         for name, path in entry['media_files'].items():
-            _log.info('Exporting {0} - {1}'.format(
+            _log.info(u'Exporting {0} - {1}'.format(
                     entry['title'],
                     name))