From 3a4443404b6646c89a033eab0a3a8747547c2c9f Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Wed, 27 Apr 2011 20:56:14 +0900
Subject: [PATCH] don't call toString() on registry results; don't cast
 QUrl.toString()

---
 aqt/browser.py | 2 +-
 aqt/editor.py  | 4 ++--
 aqt/main.py    | 5 ++---
 aqt/webview.py | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/aqt/browser.py b/aqt/browser.py
index 661eb6a54..5be5d4289 100644
--- a/aqt/browser.py
+++ b/aqt/browser.py
@@ -1206,7 +1206,7 @@ select fm.id, fm.name from fieldmodels fm""")
         self.deck.finishProgress()
 
     def dupeLinkClicked(self, link):
-        self.form.searchEdit.setText(str(link.toString()))
+        self.form.searchEdit.setText(link.toString())
         self.onSearch()
         self.onFact()
 
diff --git a/aqt/editor.py b/aqt/editor.py
index c69de697b..b5ac23c45 100644
--- a/aqt/editor.py
+++ b/aqt/editor.py
@@ -808,7 +808,7 @@ class EditorWebView(AnkiWebView):
             if not oldmime.hasHtml() and oldmime.hasUrls():
                 # qt gives it to us twice
                 txt += '<img src="%s">' % os.path.basename(
-                    unicode(oldmime.urls()[0].toString()))
+                    oldmime.urls()[0].toString())
                 mime.setHtml(txt)
             else:
                 mime.setHtml(oldmime.html())
@@ -874,7 +874,7 @@ class EditorWebView(AnkiWebView):
     def _processUrls(self, mime):
         links = []
         for url in mime.urls():
-            url = unicode(url.toString())
+            url = url.toString()
             link = self._retrieveURL(url)
             if link:
                 links.append(link)
diff --git a/aqt/main.py b/aqt/main.py
index 22142d219..a2215a67b 100755
--- a/aqt/main.py
+++ b/aqt/main.py
@@ -992,8 +992,7 @@ sync will overwrite any remote changes. Continue?"""))
             if isWin:
                 s = QSettings(QSettings.UserScope, "Microsoft", "Windows")
                 s.beginGroup("CurrentVersion/Explorer/Shell Folders")
-                p = os.path.join(unicode(s.value("Personal").toString()),
-                                 "My Dropbox")
+                p = os.path.join(s.value("Personal"), "My Dropbox")
             else:
                 p = os.path.expanduser("~/Dropbox")
         return p
@@ -1168,7 +1167,7 @@ It can take a long time. Proceed?""")):
         if isWin:
             s = QSettings(QSettings.UserScope, "Microsoft", "Windows")
             s.beginGroup("CurrentVersion/Explorer/Shell Folders")
-            d = unicode(s.value("Personal").toString())
+            d = s.value("Personal")
             if os.path.exists(d):
                 d = os.path.join(d, "Anki")
             else:
diff --git a/aqt/webview.py b/aqt/webview.py
index 1cd5dda75..b03a179ed 100644
--- a/aqt/webview.py
+++ b/aqt/webview.py
@@ -101,7 +101,7 @@ class AnkiWebView(QWebView):
     def _jsErr(self, msg, line, srcID):
         sys.stderr.write(_("JS error on line %d: %s") % (line, msg+"\n"))
     def _linkHandler(self, url):
-        self.linkHandler(unicode(url.toString()))
+        self.linkHandler(url.toString())
     def _loadFinished(self):
         self.page().mainFrame().addToJavaScriptWindowObject("py", self._bridge)
         if self._loadFinishedCB: