From ce2581269ba3cb61156f1a3d322eaa7d81082838 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Tue, 15 Jan 2013 07:28:39 +0900
Subject: [PATCH] make sure we always turn error into unicode (#488)

---
 aqt/sync.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/aqt/sync.py b/aqt/sync.py
index 78ecd5ed1..440a998a5 100644
--- a/aqt/sync.py
+++ b/aqt/sync.py
@@ -284,9 +284,11 @@ class SyncThread(QThread):
             if "Unable to find the server" in err:
                 self.fireEvent("offline")
             else:
-                if not isinstance(log, unicode):
-                    err = unicode(log, "utf8", "replace")
-                self.fireEvent("error", log)
+                if not err:
+                    err = log
+                if not isinstance(err, unicode):
+                    err = unicode(err, "utf8", "replace")
+                self.fireEvent("error", err)
             return
         if ret == "badAuth":
             return self.fireEvent("badAuth")