Merge branch 'master' of https://github.com/NoctuaNivalis/qutebrowser into NoctuaNivalis-master

qutebrowser/browser/network/qutescheme.py

@@ -45,6 +45,15 @@ from qutebrowser.config import configexc, configdata
 pyeval_output = ":pyeval was never called"
 
 
+HANDLERS = {}
+
+def add_handler(name):
+    """Add a handler to the qute: scheme."""
+    def namedecorator(function):
+        HANDLERS[name] = function
+        return function
+    return namedecorator
+
 class QuteSchemeHandler(schemehandler.SchemeHandler):
 
     """Scheme handler for qute: URLs."""
@@ -108,6 +117,7 @@ class JSBridge(QObject):
             message.error(win_id, e)
 
 
+@add_handler('pyeval')
 def qute_pyeval(_win_id, _request):
     """Handler for qute:pyeval. Return HTML content as bytes."""
     html = jinja.env.get_template('pre.html').render(
@@ -123,6 +133,7 @@ def qute_version(_win_id, _request):
     return html.encode('UTF-8', errors='xmlcharrefreplace')
 
 
+@add_handler('plainlog')
 def qute_plainlog(_win_id, _request):
     """Handler for qute:plainlog. Return HTML content as bytes."""
     if log.ram_handler is None:
@@ -133,6 +144,7 @@ def qute_plainlog(_win_id, _request):
     return html.encode('UTF-8', errors='xmlcharrefreplace')
 
 
+@add_handler('log')
 def qute_log(_win_id, _request):
     """Handler for qute:log. Return HTML content as bytes."""
     if log.ram_handler is None:
@@ -144,11 +156,13 @@ def qute_log(_win_id, _request):
     return html.encode('UTF-8', errors='xmlcharrefreplace')
 
 
+@add_handler('gpl')
 def qute_gpl(_win_id, _request):
     """Handler for qute:gpl. Return HTML content as bytes."""
     return utils.read_file('html/COPYING.html').encode('ASCII')
 
 
+@add_handler('help')
 def qute_help(win_id, request):
     """Handler for qute:help. Return HTML content as bytes."""
     try:
@@ -176,6 +190,7 @@ def qute_help(win_id, request):
     return utils.read_file(path).encode('UTF-8', errors='xmlcharrefreplace')
 
 
+@add_handler('settings')
 def qute_settings(win_id, _request):
     """Handler for qute:settings. View/change qute configuration."""
     config_getter = functools.partial(objreg.get('config').get, raw=True)
@@ -184,13 +199,3 @@ def qute_settings(win_id, _request):
         confget=config_getter)
     return html.encode('UTF-8', errors='xmlcharrefreplace')
 
-
-HANDLERS = {
-    'pyeval': qute_pyeval,
-    'version': qute_version,
-    'plainlog': qute_plainlog,
-    'log': qute_log,
-    'gpl': qute_gpl,
-    'help': qute_help,
-    'settings': qute_settings,
-}