From 876dcad28fe4036fd77fbea3cff09818f6c92d5b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 13 May 2014 22:18:59 +0200
Subject: [PATCH] Fix some more escaped quotes

---
 qutebrowser/config/_conftypes.py       | 2 +-
 qutebrowser/keyinput/_basekeyparser.py | 2 +-
 qutebrowser/keyinput/modeparsers.py    | 7 +++----
 qutebrowser/models/cmdhistory.py       | 2 +-
 qutebrowser/models/completion.py       | 2 +-
 qutebrowser/widgets/webview.py         | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/config/_conftypes.py b/qutebrowser/config/_conftypes.py
index 8de77afaa..82521b9d2 100644
--- a/qutebrowser/config/_conftypes.py
+++ b/qutebrowser/config/_conftypes.py
@@ -43,7 +43,7 @@ class ValidationError(ValueError):
     option = None
 
     def __init__(self, value, msg):
-        super().__init__("Invalid value \"{}\" - {}".format(value, msg))
+        super().__init__("Invalid value '{}' - {}".format(value, msg))
 
 
 class ValidValues:
diff --git a/qutebrowser/keyinput/_basekeyparser.py b/qutebrowser/keyinput/_basekeyparser.py
index 2baf82e4f..e2b221559 100644
--- a/qutebrowser/keyinput/_basekeyparser.py
+++ b/qutebrowser/keyinput/_basekeyparser.py
@@ -342,7 +342,7 @@ class BaseKeyParser(QObject):
                 self.bindings[key] = cmd
             else:
                 logging.warning(
-                    "Ignoring keychain '{}' in section '{}\" because "
+                    "Ignoring keychain '{}' in section '{}' because "
                     "keychains are not supported there.".format(key, sectname))
 
     def execute(self, cmdstr, keytype, count=None):
diff --git a/qutebrowser/keyinput/modeparsers.py b/qutebrowser/keyinput/modeparsers.py
index 0959676e6..70779cf9a 100644
--- a/qutebrowser/keyinput/modeparsers.py
+++ b/qutebrowser/keyinput/modeparsers.py
@@ -100,10 +100,9 @@ class HintKeyParser(CommandKeyParser):
         """
         logging.debug("Got special key {} text {}".format(e.key(), e.text()))
         if e.key() == Qt.Key_Backspace:
-            logging.debug("Got backspace, mode {}, filtertext \"{}\", "
-                          "keystring \"{}\"".format(
-                              LastPress[self._last_press], self._filtertext,
-                              self._keystring))
+            logging.debug("Got backspace, mode {}, filtertext '{}', keystring "
+                          "'{}'".format(LastPress[self._last_press],
+                                        self._filtertext, self._keystring))
             if self._last_press == LastPress.filtertext and self._filtertext:
                 self._filtertext = self._filtertext[:-1]
                 self.filter_hints.emit(self._filtertext)
diff --git a/qutebrowser/models/cmdhistory.py b/qutebrowser/models/cmdhistory.py
index c4bd74e69..ad8f3cac5 100644
--- a/qutebrowser/models/cmdhistory.py
+++ b/qutebrowser/models/cmdhistory.py
@@ -70,7 +70,7 @@ class History:
         Args:
             text: The preset text.
         """
-        logging.debug("Preset text: \"{}\"".format(text))
+        logging.debug("Preset text: '{}'".format(text))
         if text:
             items = [e for e in self._history if e.startswith(text)]
         else:
diff --git a/qutebrowser/models/completion.py b/qutebrowser/models/completion.py
index a1a808527..ce0f9ff26 100644
--- a/qutebrowser/models/completion.py
+++ b/qutebrowser/models/completion.py
@@ -120,7 +120,7 @@ class CommandCompletionModel(BaseCompletionModel):
             if not obj.hide:
                 cmdlist.append((obj.name, obj.desc))
         for name, cmd in config.section('aliases').items():
-            cmdlist.append((name, "Alias for \"{}\"".format(cmd)))
+            cmdlist.append((name, "Alias for '{}'".format(cmd)))
         cat = self.new_category("Commands")
         for (name, desc) in sorted(cmdlist):
             self.new_item(cat, name, desc)
diff --git a/qutebrowser/widgets/webview.py b/qutebrowser/widgets/webview.py
index 8b381c8a2..21336a599 100644
--- a/qutebrowser/widgets/webview.py
+++ b/qutebrowser/widgets/webview.py
@@ -146,7 +146,7 @@ class WebView(QWebView):
                 # Let's hope flash/java stuff has an application/* mimetype OR
                 # at least a classid attribute. Oh, and let's home images/...
                 # DON"T have a classid attribute. HTML sucks.
-                logging.debug("<object type=\"{}\"> clicked.".format(objtype))
+                logging.debug("<object type='{}'> clicked.".format(objtype))
                 return True
         return False