From 9b24ca39eab045d5beac061284b5e30c42a708cd Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 Jul 2014 07:34:09 +0200
Subject: [PATCH] Move normalize_keystr to utils.misc

---
 qutebrowser/keyinput/basekeyparser.py | 25 ++-----------------------
 qutebrowser/utils/misc.py             | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/qutebrowser/keyinput/basekeyparser.py b/qutebrowser/keyinput/basekeyparser.py
index 61b7c46a0..211f368f4 100644
--- a/qutebrowser/keyinput/basekeyparser.py
+++ b/qutebrowser/keyinput/basekeyparser.py
@@ -28,7 +28,7 @@ from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QObject
 import qutebrowser.config.config as config
 from qutebrowser.utils.usertypes import enum, Timer
 from qutebrowser.utils.log import keyboard as logger
-from qutebrowser.utils.misc import keyevent_to_string
+from qutebrowser.utils.misc import keyevent_to_string, normalize_keystr
 
 
 class BaseKeyParser(QObject):
@@ -102,27 +102,6 @@ class BaseKeyParser(QObject):
         if self.do_log:
             logger.debug(message)
 
-    def _normalize_keystr(self, keystr):
-        """Normalize a keystring like Ctrl-Q to a keystring like Ctrl+Q.
-
-        Args:
-            keystr: The key combination as a string.
-
-        Return:
-            The normalized keystring.
-        """
-        replacements = (
-            ('Control', 'Ctrl'),
-            ('Windows', 'Meta'),
-            ('Mod1', 'Alt'),
-            ('Mod4', 'Meta'),
-        )
-        for (orig, repl) in replacements:
-            keystr = keystr.replace(orig, repl)
-        for mod in ('Ctrl', 'Meta', 'Alt', 'Shift'):
-            keystr = keystr.replace(mod + '-', mod + '+')
-        return keystr
-
     def _handle_special_key(self, e):
         """Handle a new keypress with special keys (<Foo>).
 
@@ -343,7 +322,7 @@ class BaseKeyParser(QObject):
             if not cmd:
                 continue
             elif key.startswith('<') and key.endswith('>'):
-                keystr = self._normalize_keystr(key[1:-1])
+                keystr = normalize_keystr(key[1:-1])
                 self.special_bindings[keystr] = cmd
             elif self._supports_chains:
                 self.bindings[key] = cmd
diff --git a/qutebrowser/utils/misc.py b/qutebrowser/utils/misc.py
index 1d76ea748..6562522ce 100644
--- a/qutebrowser/utils/misc.py
+++ b/qutebrowser/utils/misc.py
@@ -440,3 +440,25 @@ def keyevent_to_string(e):
             parts.append(s)
     parts.append(key_to_string(e.key()))
     return '+'.join(parts)
+
+
+def normalize_keystr(keystr):
+    """Normalize a keystring like Ctrl-Q to a keystring like Ctrl+Q.
+
+    Args:
+        keystr: The key combination as a string.
+
+    Return:
+        The normalized keystring.
+    """
+    replacements = (
+        ('Control', 'Ctrl'),
+        ('Windows', 'Meta'),
+        ('Mod1', 'Alt'),
+        ('Mod4', 'Meta'),
+    )
+    for (orig, repl) in replacements:
+        keystr = keystr.replace(orig, repl)
+    for mod in ('Ctrl', 'Meta', 'Alt', 'Shift'):
+        keystr = keystr.replace(mod + '-', mod + '+')
+    return keystr