From 24ea85cbae16be185889395326cac1655c37e4e0 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Tue, 24 Apr 2012 10:03:43 +0900
Subject: [PATCH] tweak importing

---
 aqt/importing.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/aqt/importing.py b/aqt/importing.py
index 55584e965..8d082ab14 100644
--- a/aqt/importing.py
+++ b/aqt/importing.py
@@ -148,8 +148,9 @@ you can enter it here. Use \\t to represent tab."""),
             self.importer.run()
         except Exception, e:
             msg = _("Import failed.\n")
-            if "1-character string" in unicode(e):
-                msg += unicode(e)
+            err = unicode(e)
+            if "1-character string" in err:
+                msg += err
             else:
                 msg += unicode(traceback.format_exc(), "ascii", "replace")
             showText(msg)
@@ -160,7 +161,7 @@ you can enter it here. Use \\t to represent tab."""),
             _("Importing complete. %(num)d notes imported or updated.\n") %
             {"num": self.importer.total})
         if self.importer.log:
-            txt += _("Log of import:\n") + "\n".join(self.importer.log)
+            txt += "\n".join(self.importer.log)
         self.close()
         showText(txt)
         self.mw.reset()
@@ -276,7 +277,8 @@ def onImport(mw):
             showWarning(_("Selected file was not in UTF-8 format."))
             return
         except Exception, e:
-            if e.message == "unknownFormat":
+            msg = unicode(e)
+            if msg == "unknownFormat":
                 showWarning(_("Unknown file format."))
             else:
                 msg = _("Import failed. Debugging info:\n")