From 0b7ebe59bbb6d7e4c671eb5faddef7901f4845c1 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Mon, 21 May 2012 12:02:27 +0900
Subject: [PATCH] fix some unicode errors

---
 aqt/addons.py | 3 ++-
 aqt/sync.py   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/aqt/addons.py b/aqt/addons.py
index 27600b208..9049b17f5 100644
--- a/aqt/addons.py
+++ b/aqt/addons.py
@@ -181,6 +181,7 @@ class AddonDownloader(QThread):
     def __init__(self, code):
         QThread.__init__(self)
         self.code = code
+        self.error = None
 
     def run(self):
         # setup progress handler
@@ -200,7 +201,7 @@ class AddonDownloader(QThread):
             resp, cont = con.request(
                 aqt.appShared + "download/%d" % self.code)
         except Exception, e:
-            self.error = unicode(e)
+            self.error = unicode(e, "utf8", "replace")
             return
         finally:
             remHook("httpRecv", recvEvent)
diff --git a/aqt/sync.py b/aqt/sync.py
index 9c036591f..d6cf77c2d 100644
--- a/aqt/sync.py
+++ b/aqt/sync.py
@@ -122,7 +122,7 @@ Please upgrade to the latest version of Anki.""")
         elif "502" in err or "503" in err or "504" in err:
             return _("""\
 AnkiWeb is too busy at the moment. Please try again in a few minutes.""")
-        return err
+        return unicode(err, "utf8", "replace")
 
     def _getUserPass(self):
         d = QDialog(self.mw)