From 8cb6b832d1e1311ee4404a44ad2f471eaa00c884 Mon Sep 17 00:00:00 2001
From: Josefson Fraga <josefson@users.noreply.github.com>
Date: Mon, 2 Oct 2017 00:24:59 -0400
Subject: [PATCH 001/322] script to import history data from other browsers

---
 scripts/hist_importer.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 scripts/hist_importer.py

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
new file mode 100644
index 000000000..e69de29bb

From c6d140a40a77345c484bc8557f84f97d33539bfe Mon Sep 17 00:00:00 2001
From: Josefson Fraga <josefson@users.noreply.github.com>
Date: Mon, 2 Oct 2017 00:26:47 -0400
Subject: [PATCH 002/322] adding script to import history data from other
 browsers

---
 scripts/hist_importer.py | 135 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index e69de29bb..5f4ead361 100644
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -0,0 +1,135 @@
+#!/usr/bin/env python3
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# This file is part of qutebrowser.
+
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+
+'''
+Tool to import browser history data from other browsers. Although, safari
+support is still on the way.
+'''
+
+
+import argparse
+import sqlite3
+import sys
+
+
+def parser():
+    """Parse command line arguments."""
+    description = 'This program is meant to extract browser history from your'\
+                  'previous browser and import them into qutebrowser.'
+    epilog = 'Databases:\n\tQute: Is named "history.sqlite" and can be found '\
+             'at your --basedir. In order to find where your basedir is you '\
+             'can run ":open qute:version" inside qutebrowser.'\
+             '\n\tFirerox: Is named "places.sqlite", and can be found at your'\
+             'system\'s profile folder. Check this link for where it is locat'\
+             'ed: http://kb.mozillazine.org/Profile_folder'\
+             '\n\tChrome: Is named "History", and can be found at the respec'\
+             'tive User Data Directory. Check this link for where it is locat'\
+             'ed: https://chromium.googlesource.com/chromium/src/+/master/'\
+             'docs/user_data_dir.md\n\n'\
+             'Example: $this_script.py -b firefox -s /Firefox/Profile/places.'\
+             'sqlite -d /qutebrowser/data/history.sqlite'
+    parser = argparse.ArgumentParser(
+        description=description, epilog=epilog,
+        formatter_class=argparse.RawTextHelpFormatter
+    )
+    parser.add_argument('-b', '--browser', dest='browser', required=True,
+                        type=str, help='Browsers: {firefox, chrome, safari}')
+    parser.add_argument('-s', '--source', dest='source', required=True,
+                        type=str, help='Source: fullpath to the sqlite data'
+                        'base file from the source browser.')
+    parser.add_argument('-d', '--dest', dest='dest', required=True, type=str,
+                        help='Destination: The fullpath to the qutebrowser '
+                        'sqlite database')
+    return parser.parse_args()
+
+
+def open_db(db):
+    """Open connection with database."""
+    try:
+        conn = sqlite3.connect(db)
+        return conn
+    except Exception as e:
+        print('Error: {}'.format(e))
+        raise('Error: There was some error trying to to connect with the [{}]'
+              'database. Verify if the filepath is correct or is being used.'.
+              format(db))
+
+
+def extract(source, query):
+    """Performs extraction of (datetime,url,title) from source."""
+    try:
+        conn = open_db(source)
+        cursor = conn.cursor()
+        cursor.execute(query)
+        history = cursor.fetchall()
+        conn.close()
+        return history
+    except Exception as e:
+        # print('Error: {}'.format(e))
+        print(type(source))
+        raise('Error: There was some error trying to to connect with the [{}]'
+              'database. Verify if the filepath is correct or is being used.'.
+              format(str(source)))
+
+
+def clean(history):
+    """Receives a list of records:(datetime,url,title). And clean all records
+    in place, that has a NULL/None datetime attribute. Otherwise Qutebrowser
+    will throw errors."""
+    nulls = [record for record in history if record[0] is None]
+    for null_datetime in nulls:
+        history.remove(null_datetime)
+    return history
+
+
+def insert_qb(history, dest):
+    conn = open_db(dest)
+    cursor = conn.cursor()
+    cursor.executemany(
+        'INSERT INTO History (url,title,atime) VALUES (?,?,?)', history
+    )
+    conn.commit()
+    conn.close()
+
+
+def main():
+    args = parser()
+    browser = args.browser.lower()
+    source, dest = args.source, args.dest
+    query = {
+        'firefox': 'select url,title,last_visit_date/1000000 as date '
+        'from moz_places',
+        'chrome': 'select url,title,last_visit_time/10000000 as date '
+        'from urls',
+        'safari': None
+    }
+    if browser not in query:
+        sys.exit('Sorry, the selected browser: "{}" is not supported.'.format(
+                 browser))
+    else:
+        if browser == 'safari':
+            print('Sorry, currently we do not support this browser.')
+            sys.exit(1)
+        history = extract(source, query[browser])
+        history = clean(history)
+        insert_qb(history, dest)
+
+
+if __name__ == "__main__":
+    main()

From 4dc232f259d4a24da075e584998998873e58c221 Mon Sep 17 00:00:00 2001
From: Josefson Fraga <josefson@users.noreply.github.com>
Date: Mon, 2 Oct 2017 13:54:24 -0400
Subject: [PATCH 003/322] pylint fixes

---
 scripts/hist_importer.py | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index 5f4ead361..44a76bd8a 100644
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -17,10 +17,8 @@
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
 
-'''
-Tool to import browser history data from other browsers. Although, safari
-support is still on the way.
-'''
+'''Tool to import browser history data from other browsers. Although, safari
+support is still on the way.'''
 
 
 import argparse
@@ -44,31 +42,31 @@ def parser():
              'docs/user_data_dir.md\n\n'\
              'Example: $this_script.py -b firefox -s /Firefox/Profile/places.'\
              'sqlite -d /qutebrowser/data/history.sqlite'
-    parser = argparse.ArgumentParser(
+    parsed = argparse.ArgumentParser(
         description=description, epilog=epilog,
         formatter_class=argparse.RawTextHelpFormatter
     )
-    parser.add_argument('-b', '--browser', dest='browser', required=True,
+    parsed.add_argument('-b', '--browser', dest='browser', required=True,
                         type=str, help='Browsers: {firefox, chrome, safari}')
-    parser.add_argument('-s', '--source', dest='source', required=True,
+    parsed.add_argument('-s', '--source', dest='source', required=True,
                         type=str, help='Source: fullpath to the sqlite data'
                         'base file from the source browser.')
-    parser.add_argument('-d', '--dest', dest='dest', required=True, type=str,
+    parsed.add_argument('-d', '--dest', dest='dest', required=True, type=str,
                         help='Destination: The fullpath to the qutebrowser '
                         'sqlite database')
-    return parser.parse_args()
+    return parsed.parse_args()
 
 
-def open_db(db):
+def open_db(data_base):
     """Open connection with database."""
     try:
-        conn = sqlite3.connect(db)
+        conn = sqlite3.connect(data_base)
         return conn
-    except Exception as e:
-        print('Error: {}'.format(e))
+    except Exception as any_e:
+        print('Error: {}'.format(any_e))
         raise('Error: There was some error trying to to connect with the [{}]'
               'database. Verify if the filepath is correct or is being used.'.
-              format(db))
+              format(data_base))
 
 
 def extract(source, query):
@@ -80,8 +78,8 @@ def extract(source, query):
         history = cursor.fetchall()
         conn.close()
         return history
-    except Exception as e:
-        # print('Error: {}'.format(e))
+    except Exception as any_e:
+        print('Error: {}'.format(any_e))
         print(type(source))
         raise('Error: There was some error trying to to connect with the [{}]'
               'database. Verify if the filepath is correct or is being used.'.
@@ -99,6 +97,8 @@ def clean(history):
 
 
 def insert_qb(history, dest):
+    """Given a list of records in history and a dest db, insert all records in
+    the dest db."""
     conn = open_db(dest)
     cursor = conn.cursor()
     cursor.executemany(
@@ -109,19 +109,20 @@ def insert_qb(history, dest):
 
 
 def main():
+    """Main control flux of the script."""
     args = parser()
     browser = args.browser.lower()
     source, dest = args.source, args.dest
     query = {
         'firefox': 'select url,title,last_visit_date/1000000 as date '
-        'from moz_places',
+                   'from moz_places',
         'chrome': 'select url,title,last_visit_time/10000000 as date '
-        'from urls',
+                  'from urls',
         'safari': None
     }
     if browser not in query:
         sys.exit('Sorry, the selected browser: "{}" is not supported.'.format(
-                 browser))
+            browser))
     else:
         if browser == 'safari':
             print('Sorry, currently we do not support this browser.')

From 665a76561ecf405783f13beca694085a0803e479 Mon Sep 17 00:00:00 2001
From: Josefson Fraga <josefson@users.noreply.github.com>
Date: Mon, 2 Oct 2017 22:50:52 -0400
Subject: [PATCH 004/322] add insertions to ComandHistory table as well

---
 scripts/hist_importer.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index 44a76bd8a..8df16384a 100644
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -104,6 +104,10 @@ def insert_qb(history, dest):
     cursor.executemany(
         'INSERT INTO History (url,title,atime) VALUES (?,?,?)', history
     )
+    cursor.executemany(
+        'INSERT INTO CompletionHistory (url,title,last_atime) VALUES (?,?,?)',
+        history
+    )
     conn.commit()
     conn.close()
 

From 92f9a8503ee90cba87bc11b9aa983e8c8069c497 Mon Sep 17 00:00:00 2001
From: Josefson Fraga <josefson@users.noreply.github.com>
Date: Tue, 3 Oct 2017 01:55:31 -0400
Subject: [PATCH 005/322] add required redirect (url,title,atime,redirect)

---
 scripts/hist_importer.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index 8df16384a..d96284879 100644
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -89,10 +89,14 @@ def extract(source, query):
 def clean(history):
     """Receives a list of records:(datetime,url,title). And clean all records
     in place, that has a NULL/None datetime attribute. Otherwise Qutebrowser
-    will throw errors."""
+    will throw errors. Also, will add a 4rth attribute of '0' for the redirect
+    field in history.sqlite in qutebrowser."""
     nulls = [record for record in history if record[0] is None]
     for null_datetime in nulls:
         history.remove(null_datetime)
+    history = [list(record) for record in history]
+    for record in history:
+        record.append('0')
     return history
 
 
@@ -102,12 +106,10 @@ def insert_qb(history, dest):
     conn = open_db(dest)
     cursor = conn.cursor()
     cursor.executemany(
-        'INSERT INTO History (url,title,atime) VALUES (?,?,?)', history
-    )
-    cursor.executemany(
-        'INSERT INTO CompletionHistory (url,title,last_atime) VALUES (?,?,?)',
+        'INSERT INTO History (url,title,atime,redirect) VALUES (?,?,?,?)',
         history
     )
+    cursor.execute('DROP TABLE CompletionHistory')
     conn.commit()
     conn.close()
 

From 96599b96846aa108698946eb7d49ad7dc33581f0 Mon Sep 17 00:00:00 2001
From: Josefson Fraga <josefson@users.noreply.github.com>
Date: Fri, 17 Nov 2017 02:38:56 -0300
Subject: [PATCH 006/322] revisions set by The Compiler

---
 scripts/hist_importer.py | 95 ++++++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 48 deletions(-)
 mode change 100644 => 100755 scripts/hist_importer.py

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
old mode 100644
new mode 100755
index d96284879..f27b4e267
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -1,8 +1,11 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# This file is part of qutebrowser.
+# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2017 Josefson Souza <josefson.br@gmail.com>
 
+# This file is part of qutebrowser.
+#
 # qutebrowser is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -17,60 +20,60 @@
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
 
-'''Tool to import browser history data from other browsers. Although, safari
-support is still on the way.'''
+"""Tool to import browser history from other browsers."""
 
 
 import argparse
 import sqlite3
 import sys
+import os
 
 
-def parser():
+def parse():
     """Parse command line arguments."""
-    description = 'This program is meant to extract browser history from your'\
-                  'previous browser and import them into qutebrowser.'
-    epilog = 'Databases:\n\tQute: Is named "history.sqlite" and can be found '\
-             'at your --basedir. In order to find where your basedir is you '\
-             'can run ":open qute:version" inside qutebrowser.'\
-             '\n\tFirerox: Is named "places.sqlite", and can be found at your'\
-             'system\'s profile folder. Check this link for where it is locat'\
-             'ed: http://kb.mozillazine.org/Profile_folder'\
-             '\n\tChrome: Is named "History", and can be found at the respec'\
-             'tive User Data Directory. Check this link for where it is locat'\
-             'ed: https://chromium.googlesource.com/chromium/src/+/master/'\
-             'docs/user_data_dir.md\n\n'\
-             'Example: $this_script.py -b firefox -s /Firefox/Profile/places.'\
-             'sqlite -d /qutebrowser/data/history.sqlite'
-    parsed = argparse.ArgumentParser(
+    description = ("This program is meant to extract browser history from your"
+                   "previous browser and import them into qutebrowser.")
+    epilog = ("Databases:\n\tQutebrowser: Is named 'history.sqlite' and can be"
+              " found at your --basedir. In order to find where your basedir"
+              " is you can run ':open qute:version' inside qutebrowser."
+              "\n\tFirerox: Is named 'places.sqlite', and can be found at your"
+              "system\"s profile folder. Check this link for where it is locat"
+              "ed: http://kb.mozillazine.org/Profile_folder"
+              "\n\tChrome: Is named 'History', and can be found at the respec"
+              "tive User Data Directory. Check this link for where it is locat"
+              "ed: https://chromium.googlesource.com/chromium/src/+/master/"
+              "docs/user_data_dir.md\n\n"
+              "Example: hist_importer.py -b firefox -s /Firefox/Profile/"
+              "places.sqlite -d /qutebrowser/data/history.sqlite")
+    parser = argparse.ArgumentParser(
         description=description, epilog=epilog,
         formatter_class=argparse.RawTextHelpFormatter
     )
-    parsed.add_argument('-b', '--browser', dest='browser', required=True,
-                        type=str, help='Browsers: {firefox, chrome, safari}')
-    parsed.add_argument('-s', '--source', dest='source', required=True,
-                        type=str, help='Source: fullpath to the sqlite data'
+    parser.add_argument('-b', '--browser', dest='browser', required=True,
+                        type=str, help='Browsers: {firefox, chrome}')
+    parser.add_argument('-s', '--source', dest='source', required=True,
+                        type=str, help='Source: Full path to the sqlite data'
                         'base file from the source browser.')
-    parsed.add_argument('-d', '--dest', dest='dest', required=True, type=str,
-                        help='Destination: The fullpath to the qutebrowser '
+    parser.add_argument('-d', '--dest', dest='dest', required=True, type=str,
+                        help='Destination: The full path to the qutebrowser '
                         'sqlite database')
-    return parsed.parse_args()
+    return parser.parse_args()
 
 
 def open_db(data_base):
     """Open connection with database."""
-    try:
+    if os.path.isfile(data_base):
         conn = sqlite3.connect(data_base)
         return conn
-    except Exception as any_e:
-        print('Error: {}'.format(any_e))
-        raise('Error: There was some error trying to to connect with the [{}]'
-              'database. Verify if the filepath is correct or is being used.'.
-              format(data_base))
+    else:
+        raise sys.exit('\nDataBaseNotFound: There was some error trying to to'
+                       ' connect with the [{}] database. Verify if the'
+                       ' filepath is correct or is being used.'
+                       .format(data_base))
 
 
 def extract(source, query):
-    """Performs extraction of (datetime,url,title) from source."""
+    """Extracts (datetime,url,title) from source database."""
     try:
         conn = open_db(source)
         cursor = conn.cursor()
@@ -78,18 +81,17 @@ def extract(source, query):
         history = cursor.fetchall()
         conn.close()
         return history
-    except Exception as any_e:
-        print('Error: {}'.format(any_e))
-        print(type(source))
-        raise('Error: There was some error trying to to connect with the [{}]'
-              'database. Verify if the filepath is correct or is being used.'.
-              format(str(source)))
+    except sqlite3.OperationalError as op_e:
+        print('\nCould not perform queries into the source database: {}'
+              '\nBrowser version is not supported as it have a different sql'
+              ' schema.'.format(op_e))
 
 
 def clean(history):
-    """Receives a list of records:(datetime,url,title). And clean all records
-    in place, that has a NULL/None datetime attribute. Otherwise Qutebrowser
-    will throw errors. Also, will add a 4rth attribute of '0' for the redirect
+    """Clean up records from source database.
+    Receives a list of records:(datetime,url,title). And clean all records
+    in place, that has a NULL/None datetime attribute. Otherwise qutebrowser
+    will throw errors. Also, will add a 4th attribute of '0' for the redirect
     field in history.sqlite in qutebrowser."""
     nulls = [record for record in history if record[0] is None]
     for null_datetime in nulls:
@@ -101,7 +103,8 @@ def clean(history):
 
 
 def insert_qb(history, dest):
-    """Given a list of records in history and a dest db, insert all records in
+    """Insert history into dest database
+    Given a list of records in history and a dest db, insert all records in
     the dest db."""
     conn = open_db(dest)
     cursor = conn.cursor()
@@ -116,7 +119,7 @@ def insert_qb(history, dest):
 
 def main():
     """Main control flux of the script."""
-    args = parser()
+    args = parse()
     browser = args.browser.lower()
     source, dest = args.source, args.dest
     query = {
@@ -124,15 +127,11 @@ def main():
                    'from moz_places',
         'chrome': 'select url,title,last_visit_time/10000000 as date '
                   'from urls',
-        'safari': None
     }
     if browser not in query:
         sys.exit('Sorry, the selected browser: "{}" is not supported.'.format(
             browser))
     else:
-        if browser == 'safari':
-            print('Sorry, currently we do not support this browser.')
-            sys.exit(1)
         history = extract(source, query[browser])
         history = clean(history)
         insert_qb(history, dest)

From 3131d3d3bc8acf7ba40029ffcfe59f2454d0bfbc Mon Sep 17 00:00:00 2001
From: Josefson Fraga <josefson@users.noreply.github.com>
Date: Fri, 17 Nov 2017 11:48:34 -0300
Subject: [PATCH 007/322] Flake8 warnings pointed by travis.

---
 scripts/hist_importer.py | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index f27b4e267..79c723c58 100755
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -73,7 +73,15 @@ def open_db(data_base):
 
 
 def extract(source, query):
-    """Extracts (datetime,url,title) from source database."""
+    """Get records from source database.
+
+    Args:
+        source: File path to the source database where we want to extract the
+        data from.
+        query: The query string to be executed in order to retrieve relevant
+        attributes as (datetime, url, time) from the source database according
+        to the browser chosen.
+    """
     try:
         conn = open_db(source)
         cursor = conn.cursor()
@@ -89,10 +97,15 @@ def extract(source, query):
 
 def clean(history):
     """Clean up records from source database.
-    Receives a list of records:(datetime,url,title). And clean all records
-    in place, that has a NULL/None datetime attribute. Otherwise qutebrowser
-    will throw errors. Also, will add a 4th attribute of '0' for the redirect
-    field in history.sqlite in qutebrowser."""
+
+    Receives a list of record and sanityze them in order for them to be
+    properly imported to qutebrowser. Sanitation requires addiing a 4th
+    attribute 'redirect' which is filled with '0's, and also purging all
+    records that have a NULL/None datetime attribute.
+
+    Args:
+        history: List of records (datetime, url, title) from source database.
+    """
     nulls = [record for record in history if record[0] is None]
     for null_datetime in nulls:
         history.remove(null_datetime)
@@ -103,9 +116,13 @@ def clean(history):
 
 
 def insert_qb(history, dest):
-    """Insert history into dest database
-    Given a list of records in history and a dest db, insert all records in
-    the dest db."""
+    """Insert history into dest database.
+
+    Args:
+        history: List of records.
+        dest: File path to the destination database, where history will be
+        inserted.
+    """
     conn = open_db(dest)
     cursor = conn.cursor()
     cursor.executemany(

From 95f8c07d7fbd8e45b244e3d5d9d381fb58ea411a Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 00:31:53 +0100
Subject: [PATCH 008/322] lazy sessions

---
 qutebrowser/browser/qutescheme.py |  7 +++++++
 qutebrowser/config/configdata.yml |  8 ++++++++
 qutebrowser/misc/sessions.py      | 17 ++++++++++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 11dcfe004..f943fcba4 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -424,6 +424,13 @@ def qute_settings(url):
                         confget=config.instance.get_str)
     return 'text/html', html
 
+@add_handler('back')
+def qute_back(url):
+    """Handler for qute://back. Simple page to free ram / lazy load a site,
+    goes back on focusing the tab."""
+
+    html = jinja.render('back.html', title='Suspended')
+    return 'text/html', html
 
 @add_handler('configdiff')
 def qute_configdiff(url):
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index ba8c36857..7284d98d5 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -88,6 +88,14 @@ session_default_name:
 
     If this is set to null, the session which was last loaded is saved.
 
+session_lazy_restore:
+  type:
+    name: Bool
+    none_ok: true
+  default: false
+  desc: >-
+    Load a restored tab as soon as it takes focus.
+
 backend:
   type:
     name: String
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 064d8c9e9..471805da9 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -347,7 +347,9 @@ class SessionManager(QObject):
             if 'pinned' in histentry:
                 new_tab.data.pinned = histentry['pinned']
 
-            active = histentry.get('active', False)
+            active = (histentry.get('active', False) and
+                     (not config.val.session_lazy_restore or
+                      histentry['url'].startswith('qute://')))
             url = QUrl.fromEncoded(histentry['url'].encode('ascii'))
             if 'original-url' in histentry:
                 orig_url = QUrl.fromEncoded(
@@ -360,6 +362,19 @@ class SessionManager(QObject):
             entries.append(entry)
             if active:
                 new_tab.title_changed.emit(histentry['title'])
+
+        if config.val.session_lazy_restore and data['history']:
+            last = data['history'][-1]
+            title = last['title']
+            url = 'qute://back#' + title
+            active = last.get('active', False)
+
+            if not last['url'].startswith('qute://'):
+                entries.append(TabHistoryItem(url=QUrl.fromEncoded(url.encode('ascii')),
+                                              title=title, active=active, user_data={}))
+                if active:
+                    new_tab.title_changed.emit(title)
+
         try:
             new_tab.history.load_items(entries)
         except ValueError as e:

From ade7004f8f4429affc27a8f5b03ad783ca994ca9 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 00:48:31 +0100
Subject: [PATCH 009/322] lazy sessions

---
 qutebrowser/browser/qutescheme.py |  2 ++
 qutebrowser/misc/sessions.py      | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index f943fcba4..3881a0d2e 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -424,6 +424,7 @@ def qute_settings(url):
                         confget=config.instance.get_str)
     return 'text/html', html
 
+
 @add_handler('back')
 def qute_back(url):
     """Handler for qute://back. Simple page to free ram / lazy load a site,
@@ -432,6 +433,7 @@ def qute_back(url):
     html = jinja.render('back.html', title='Suspended')
     return 'text/html', html
 
+
 @add_handler('configdiff')
 def qute_configdiff(url):
     """Handler for qute://configdiff."""
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 471805da9..4784f796a 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -348,8 +348,8 @@ class SessionManager(QObject):
                 new_tab.data.pinned = histentry['pinned']
 
             active = (histentry.get('active', False) and
-                     (not config.val.session_lazy_restore or
-                      histentry['url'].startswith('qute://')))
+                        (not config.val.session_lazy_restore or
+                        histentry['url'].startswith('qute://')))
             url = QUrl.fromEncoded(histentry['url'].encode('ascii'))
             if 'original-url' in histentry:
                 orig_url = QUrl.fromEncoded(
@@ -370,8 +370,10 @@ class SessionManager(QObject):
             active = last.get('active', False)
 
             if not last['url'].startswith('qute://'):
-                entries.append(TabHistoryItem(url=QUrl.fromEncoded(url.encode('ascii')),
-                                              title=title, active=active, user_data={}))
+                entries.append(TabHistoryItem(
+                    url=QUrl.fromEncoded(url.encode('ascii')),
+                    title=title, active=active, user_data={}))
+
                 if active:
                     new_tab.title_changed.emit(title)
 

From 51dea053f459c7cd0977c75047ff41a2f3ca1060 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 01:00:16 +0100
Subject: [PATCH 010/322] lazy sessions

---
 qutebrowser/html/back.html | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 qutebrowser/html/back.html

diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
new file mode 100644
index 000000000..8a21f3d80
--- /dev/null
+++ b/qutebrowser/html/back.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+
+{% block script %}
+window.onload = function() {
+	var title = 'Suspended: ' + document.location.hash.substr(1);
+	var node = document.getElementsByTagName('h1')[0];
+	node.innerText = document.title = title;
+};
+window.onfocus = function() {
+	window.history.back();
+};
+{% endblock %}
+
+{% block content %}
+<noscript><h1 class="noscript">View Only</h1><p class="noscript-text">Changing settings requires javascript to be enabled!</p></noscript>
+<header><h1>{{ title }}</h1></header>
+
+{% endblock %}

From c4bb13431331b7c5aad5696f54998210c12a1f12 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 11:04:04 +0100
Subject: [PATCH 011/322] lazy sessions, improved version

---
 qutebrowser/misc/sessions.py | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 4784f796a..da49205df 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -323,6 +323,18 @@ class SessionManager(QObject):
     def _load_tab(self, new_tab, data):
         """Load yaml data into a newly opened tab."""
         entries = []
+
+        if config.val.session_lazy_restore and data['history']:
+            last = data['history'][-1]
+
+            if not last['url'].startswith('qute://'):
+                data['history'].append({
+                    'title': last['title'],
+                    'url': 'qute://back#' + last['title'],
+                    'active': last.get('active', False)
+                })
+                last['active'] = False
+
         for histentry in data['history']:
             user_data = {}
 
@@ -347,9 +359,7 @@ class SessionManager(QObject):
             if 'pinned' in histentry:
                 new_tab.data.pinned = histentry['pinned']
 
-            active = (histentry.get('active', False) and
-                        (not config.val.session_lazy_restore or
-                        histentry['url'].startswith('qute://')))
+            active = histentry.get('active', False)
             url = QUrl.fromEncoded(histentry['url'].encode('ascii'))
             if 'original-url' in histentry:
                 orig_url = QUrl.fromEncoded(
@@ -363,20 +373,6 @@ class SessionManager(QObject):
             if active:
                 new_tab.title_changed.emit(histentry['title'])
 
-        if config.val.session_lazy_restore and data['history']:
-            last = data['history'][-1]
-            title = last['title']
-            url = 'qute://back#' + title
-            active = last.get('active', False)
-
-            if not last['url'].startswith('qute://'):
-                entries.append(TabHistoryItem(
-                    url=QUrl.fromEncoded(url.encode('ascii')),
-                    title=title, active=active, user_data={}))
-
-                if active:
-                    new_tab.title_changed.emit(title)
-
         try:
             new_tab.history.load_items(entries)
         except ValueError as e:

From c150c5481a093a14c42ef1233cc54214972bc381 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 13:46:50 +0100
Subject: [PATCH 012/322] lazy sessions, dont save qute://back

---
 qutebrowser/misc/sessions.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index da49205df..807d4bde4 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -205,7 +205,11 @@ class SessionManager(QObject):
         for idx, item in enumerate(tab.history):
             qtutils.ensure_valid(item)
             item_data = self._save_tab_item(tab, idx, item)
-            data['history'].append(item_data)
+            if item_data['url'].startswith('qute://back'):
+                if 'active' in item_data and data['history']:
+                    data['history'][-1]['active'] = item_data.get('active', False)
+            else:
+                data['history'].append(item_data)
         return data
 
     def _save_all(self, *, only_window=None, with_private=False):

From 1a33c88c9607fdfd71b925699994981ce19a8827 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 13:47:57 +0100
Subject: [PATCH 013/322] lazy sessions, dont save qute://back

---
 qutebrowser/misc/sessions.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 807d4bde4..1dc27397d 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -207,7 +207,8 @@ class SessionManager(QObject):
             item_data = self._save_tab_item(tab, idx, item)
             if item_data['url'].startswith('qute://back'):
                 if 'active' in item_data and data['history']:
-                    data['history'][-1]['active'] = item_data.get('active', False)
+                    data['history'][-1]['active'] = \
+                        item_data.get('active', False)
             else:
                 data['history'].append(item_data)
         return data

From 2debeafe1bd5ee7dfb0a88a57957554fd03934d2 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 13:51:30 +0100
Subject: [PATCH 014/322] lazy sessions, dont save qute://back

---
 qutebrowser/misc/sessions.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 1dc27397d..c44b2ed8b 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -206,9 +206,8 @@ class SessionManager(QObject):
             qtutils.ensure_valid(item)
             item_data = self._save_tab_item(tab, idx, item)
             if item_data['url'].startswith('qute://back'):
-                if 'active' in item_data and data['history']:
-                    data['history'][-1]['active'] = \
-                        item_data.get('active', False)
+                if item_data.get('active', False) and data['history']:
+                    data['history'][-1]['active'] = True
             else:
                 data['history'].append(item_data)
         return data

From cf8130bd225d4b4497f79d3ccd1d9a3226b7a6b8 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 14:12:37 +0100
Subject: [PATCH 015/322] lazy session, fix: active entry is not the end of the
 history

---
 qutebrowser/html/back.html   | 14 +++++++++++---
 qutebrowser/misc/sessions.py | 26 +++++++++++++++++---------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index 8a21f3d80..c28419a64 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -6,9 +6,17 @@ window.onload = function() {
 	var node = document.getElementsByTagName('h1')[0];
 	node.innerText = document.title = title;
 };
-window.onfocus = function() {
-	window.history.back();
-};
+setTimeout(function() {
+	/* drop first focus event, to avoid problems
+	(allow to go easily to newer history entries) */
+	var triggered = false;
+	window.onfocus = function() {
+		if (! triggered) {
+			triggered = true;
+			window.history.back();
+		}
+	};
+}, 1000);
 {% endblock %}
 
 {% block content %}
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index c44b2ed8b..0e2b40c68 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -206,7 +206,9 @@ class SessionManager(QObject):
             qtutils.ensure_valid(item)
             item_data = self._save_tab_item(tab, idx, item)
             if item_data['url'].startswith('qute://back'):
+                # dont add qute://back to the session file
                 if item_data.get('active', False) and data['history']:
+                    # mark entry before qute://back as active
                     data['history'][-1]['active'] = True
             else:
                 data['history'].append(item_data)
@@ -331,15 +333,7 @@ class SessionManager(QObject):
         if config.val.session_lazy_restore and data['history']:
             last = data['history'][-1]
 
-            if not last['url'].startswith('qute://'):
-                data['history'].append({
-                    'title': last['title'],
-                    'url': 'qute://back#' + last['title'],
-                    'active': last.get('active', False)
-                })
-                last['active'] = False
-
-        for histentry in data['history']:
+        for i, histentry in enumerate(data['history']):
             user_data = {}
 
             if 'zoom' in data:
@@ -363,6 +357,20 @@ class SessionManager(QObject):
             if 'pinned' in histentry:
                 new_tab.data.pinned = histentry['pinned']
 
+            if (config.val.session_lazy_restore and
+                    histentry.get('active', False) and
+                    not histentry['url'].startswith('qute://back')):
+                # remove "active" mark and insert back page marked as active
+                data['history'].insert(
+                    i + 1,
+                    {
+                        'title': histentry['title'],
+                        'url': 'qute://back#' + histentry['title'],
+                        'active': True
+                    })
+                histentry['active'] = False
+
+            print(histentry)
             active = histentry.get('active', False)
             url = QUrl.fromEncoded(histentry['url'].encode('ascii'))
             if 'original-url' in histentry:

From 13dc24f6cafe297b570b60d1ca28ae4f6a76d3c4 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Sat, 18 Nov 2017 14:31:55 +0100
Subject: [PATCH 016/322] debug code removed

---
 qutebrowser/misc/sessions.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 0e2b40c68..c3634a64a 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -330,9 +330,6 @@ class SessionManager(QObject):
         """Load yaml data into a newly opened tab."""
         entries = []
 
-        if config.val.session_lazy_restore and data['history']:
-            last = data['history'][-1]
-
         for i, histentry in enumerate(data['history']):
             user_data = {}
 
@@ -370,7 +367,6 @@ class SessionManager(QObject):
                     })
                 histentry['active'] = False
 
-            print(histentry)
             active = histentry.get('active', False)
             url = QUrl.fromEncoded(histentry['url'].encode('ascii'))
             if 'original-url' in histentry:

From aa40842848a60039c3978e0e7b8d0c3c4eb8f6e5 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Tue, 21 Nov 2017 00:38:51 +0100
Subject: [PATCH 017/322] lazy sessions, docstring formatted, settings renamed,
 javascript notice changed, insert method changed

---
 doc/help/commands.asciidoc        |  2 +-
 doc/help/settings.asciidoc        |  6 +++---
 qutebrowser/browser/qutescheme.py |  8 +++++---
 qutebrowser/config/configdata.yml |  8 +++++---
 qutebrowser/html/back.html        | 16 +++-------------
 qutebrowser/misc/sessions.py      | 27 ++++++++++++++++++---------
 tests/unit/misc/test_sessions.py  |  2 +-
 7 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 04377c055..aa94de305 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -1070,7 +1070,7 @@ Syntax: +:session-save [*--current*] [*--quiet*] [*--force*] [*--only-active-win
 Save a session.
 
 ==== positional arguments
-* +'name'+: The name of the session. If not given, the session configured in session_default_name is saved.
+* +'name'+: The name of the session. If not given, the session configured in session.default_name is saved.
 
 
 ==== optional arguments
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 64881f619..9f694c184 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -222,7 +222,7 @@
 |<<qt.highdpi,qt.highdpi>>|Turn on Qt HighDPI scaling.
 |<<scrolling.bar,scrolling.bar>>|Show a scrollbar.
 |<<scrolling.smooth,scrolling.smooth>>|Enable smooth scrolling for web pages.
-|<<session_default_name,session_default_name>>|Name of the session to save by default.
+|<<session.default_name,session.default_name>>|Name of the session to save by default.
 |<<spellcheck.languages,spellcheck.languages>>|Languages to use for spell checking.
 |<<statusbar.hide,statusbar.hide>>|Hide the statusbar unless a message is shown.
 |<<statusbar.padding,statusbar.padding>>|Padding (in pixels) for the statusbar.
@@ -2554,8 +2554,8 @@ Type: <<types,Bool>>
 
 Default: +pass:[false]+
 
-[[session_default_name]]
-=== session_default_name
+[[session.default_name]]
+=== session.default_name
 Name of the session to save by default.
 If this is set to null, the session which was last loaded is saved.
 
diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 3881a0d2e..4db7bdc84 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -427,10 +427,12 @@ def qute_settings(url):
 
 @add_handler('back')
 def qute_back(url):
-    """Handler for qute://back. Simple page to free ram / lazy load a site,
-    goes back on focusing the tab."""
+    """Handler for qute://back.
 
-    html = jinja.render('back.html', title='Suspended')
+    Simple page to free ram / lazy load a site, goes back on focusing the tab.
+    """
+    html = jinja.render('back.html',
+                        title='Suspended: ' + url.url().split('#')[-1])
     return 'text/html', html
 
 
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 7284d98d5..7f362daa4 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -79,6 +79,9 @@ new_instance_open_target_window:
     When `new_instance_open_target` is not set to `window`, this is ignored.
 
 session_default_name:
+  renamed: session.default_name
+
+session.default_name:
   type:
     name: SessionName
     none_ok: true
@@ -88,13 +91,12 @@ session_default_name:
 
     If this is set to null, the session which was last loaded is saved.
 
-session_lazy_restore:
+session.lazy_restore:
   type:
     name: Bool
     none_ok: true
   default: false
-  desc: >-
-    Load a restored tab as soon as it takes focus.
+  desc: Load a restored tab as soon as it takes focus.
 
 backend:
   type:
diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index c28419a64..0d06158f2 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -1,26 +1,16 @@
 {% extends "base.html" %}
 
 {% block script %}
-window.onload = function() {
-	var title = 'Suspended: ' + document.location.hash.substr(1);
-	var node = document.getElementsByTagName('h1')[0];
-	node.innerText = document.title = title;
-};
 setTimeout(function() {
 	/* drop first focus event, to avoid problems
 	(allow to go easily to newer history entries) */
-	var triggered = false;
 	window.onfocus = function() {
-		if (! triggered) {
-			triggered = true;
-			window.history.back();
-		}
+		window.onfocus = null;
+		window.history.back();
 	};
 }, 1000);
 {% endblock %}
 
 {% block content %}
-<noscript><h1 class="noscript">View Only</h1><p class="noscript-text">Changing settings requires javascript to be enabled!</p></noscript>
-<header><h1>{{ title }}</h1></header>
-
+<noscript><p class="noscript-text">Javascript isn't enabled. So you need to manually go back in history to restore this tab.</p></noscript>
 {% endblock %}
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index c3634a64a..faee99c99 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -22,6 +22,8 @@
 import os
 import os.path
 
+from itertools import chain, dropwhile, takewhile
+
 import sip
 from PyQt5.QtCore import QUrl, QObject, QPoint, QTimer
 from PyQt5.QtWidgets import QApplication
@@ -205,8 +207,8 @@ class SessionManager(QObject):
         for idx, item in enumerate(tab.history):
             qtutils.ensure_valid(item)
             item_data = self._save_tab_item(tab, idx, item)
-            if item_data['url'].startswith('qute://back'):
-                # dont add qute://back to the session file
+            if item.url().url().startswith('qute://back'):
+                # don't add qute://back to the session file
                 if item_data.get('active', False) and data['history']:
                     # mark entry before qute://back as active
                     data['history'][-1]['active'] = True
@@ -257,7 +259,7 @@ class SessionManager(QObject):
                   object.
         """
         if name is default:
-            name = config.val.session_default_name
+            name = config.val.session.default_name
             if name is None:
                 if self._current is not None:
                     name = self._current
@@ -329,8 +331,16 @@ class SessionManager(QObject):
     def _load_tab(self, new_tab, data):
         """Load yaml data into a newly opened tab."""
         entries = []
+        lazy_load = []
+        # use len(data['history'])
+        # -> dropwhile empty if not session.lazy_session
+        lazy_index = len(data['history'])
+        gen = chain(
+            takewhile(lambda _: not lazy_load, enumerate(data['history'])),
+            enumerate(lazy_load),
+            dropwhile(lambda i: i[0] < lazy_index, enumerate(data['history'])))
 
-        for i, histentry in enumerate(data['history']):
+        for i, histentry in gen:
             user_data = {}
 
             if 'zoom' in data:
@@ -354,13 +364,12 @@ class SessionManager(QObject):
             if 'pinned' in histentry:
                 new_tab.data.pinned = histentry['pinned']
 
-            if (config.val.session_lazy_restore and
+            if (config.val.session.lazy_restore and
                     histentry.get('active', False) and
                     not histentry['url'].startswith('qute://back')):
                 # remove "active" mark and insert back page marked as active
-                data['history'].insert(
-                    i + 1,
-                    {
+                lazy_index = i + 1
+                lazy_load.append({
                         'title': histentry['title'],
                         'url': 'qute://back#' + histentry['title'],
                         'active': True
@@ -481,7 +490,7 @@ class SessionManager(QObject):
 
         Args:
             name: The name of the session. If not given, the session configured
-                  in session_default_name is saved.
+                  in session.default_name is saved.
             current: Save the current session instead of the default.
             quiet: Don't show confirmation message.
             force: Force saving internal sessions (starting with an underline).
diff --git a/tests/unit/misc/test_sessions.py b/tests/unit/misc/test_sessions.py
index 771430d5b..b2cb8a3dd 100644
--- a/tests/unit/misc/test_sessions.py
+++ b/tests/unit/misc/test_sessions.py
@@ -170,7 +170,7 @@ class TestSaveAll:
 ])
 def test_get_session_name(config_stub, sess_man, arg, config, current,
                           expected):
-    config_stub.val.session_default_name = config
+    config_stub.val.session.default_name = config
     sess_man._current = current
     assert sess_man._get_session_name(arg) == expected
 

From 607cd9ba6ee568849b111c2a950acb5c3ec0d9e8 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Tue, 21 Nov 2017 01:19:04 +0100
Subject: [PATCH 018/322] indent adjusted

---
 qutebrowser/misc/sessions.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index faee99c99..7a26d161c 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -370,10 +370,10 @@ class SessionManager(QObject):
                 # remove "active" mark and insert back page marked as active
                 lazy_index = i + 1
                 lazy_load.append({
-                        'title': histentry['title'],
-                        'url': 'qute://back#' + histentry['title'],
-                        'active': True
-                    })
+                    'title': histentry['title'],
+                    'url': 'qute://back#' + histentry['title'],
+                    'active': True
+                })
                 histentry['active'] = False
 
             active = histentry.get('active', False)

From e2d5a443cc746885f6fb3512470298b168904e29 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Tue, 21 Nov 2017 23:57:06 +0100
Subject: [PATCH 019/322] lazy sessions

---
 qutebrowser/browser/qutescheme.py |  2 +-
 qutebrowser/config/configdata.yml |  4 +---
 qutebrowser/html/back.html        |  2 +-
 qutebrowser/misc/sessions.py      | 15 ++++++++-------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 4db7bdc84..f12ef529a 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -432,7 +432,7 @@ def qute_back(url):
     Simple page to free ram / lazy load a site, goes back on focusing the tab.
     """
     html = jinja.render('back.html',
-                        title='Suspended: ' + url.url().split('#')[-1])
+                        title='Suspended: ' + url.fragment())
     return 'text/html', html
 
 
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 7f362daa4..39c0fa6b1 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -92,9 +92,7 @@ session.default_name:
     If this is set to null, the session which was last loaded is saved.
 
 session.lazy_restore:
-  type:
-    name: Bool
-    none_ok: true
+  type: Bool
   default: false
   desc: Load a restored tab as soon as it takes focus.
 
diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index 0d06158f2..83f5cb74e 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -12,5 +12,5 @@ setTimeout(function() {
 {% endblock %}
 
 {% block content %}
-<noscript><p class="noscript-text">Javascript isn't enabled. So you need to manually go back in history to restore this tab.</p></noscript>
+<noscript><p>Javascript isn't enabled. So you need to manually go back in history to restore this tab.</p></noscript>
 {% endblock %}
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 7a26d161c..64d170dab 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -21,8 +21,7 @@
 
 import os
 import os.path
-
-from itertools import chain, dropwhile, takewhile
+import itertools
 
 import sip
 from PyQt5.QtCore import QUrl, QObject, QPoint, QTimer
@@ -207,7 +206,7 @@ class SessionManager(QObject):
         for idx, item in enumerate(tab.history):
             qtutils.ensure_valid(item)
             item_data = self._save_tab_item(tab, idx, item)
-            if item.url().url().startswith('qute://back'):
+            if item.url().scheme() == 'qute' and item.url().host() == 'back':
                 # don't add qute://back to the session file
                 if item_data.get('active', False) and data['history']:
                     # mark entry before qute://back as active
@@ -335,10 +334,12 @@ class SessionManager(QObject):
         # use len(data['history'])
         # -> dropwhile empty if not session.lazy_session
         lazy_index = len(data['history'])
-        gen = chain(
-            takewhile(lambda _: not lazy_load, enumerate(data['history'])),
-            enumerate(lazy_load),
-            dropwhile(lambda i: i[0] < lazy_index, enumerate(data['history'])))
+        gen = itertools.chain(
+                itertools.takewhile(lambda _: not lazy_load,
+                                    enumerate(data['history'])),
+                enumerate(lazy_load),
+                itertools.dropwhile(lambda i: i[0] < lazy_index,
+                                    enumerate(data['history'])))
 
         for i, histentry in gen:
             user_data = {}

From 9df149fe8fc0822fcdc6a718e3542782aca22fe6 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Fri, 24 Nov 2017 17:15:26 +0100
Subject: [PATCH 020/322] urlencode fix

---
 qutebrowser/browser/qutescheme.py | 6 ++++--
 qutebrowser/misc/sessions.py      | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index f12ef529a..9771f6db1 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -29,6 +29,7 @@ import os
 import time
 import textwrap
 import mimetypes
+import urllib
 
 import pkg_resources
 from PyQt5.QtCore import QUrlQuery, QUrl
@@ -431,8 +432,9 @@ def qute_back(url):
 
     Simple page to free ram / lazy load a site, goes back on focusing the tab.
     """
-    html = jinja.render('back.html',
-                        title='Suspended: ' + url.fragment())
+    html = jinja.render(
+            'back.html',
+            title='Suspended: ' + urllib.parse.unquote(url.fragment()))
     return 'text/html', html
 
 
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 64d170dab..1b0106f1b 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -22,6 +22,7 @@
 import os
 import os.path
 import itertools
+import urllib
 
 import sip
 from PyQt5.QtCore import QUrl, QObject, QPoint, QTimer
@@ -372,7 +373,9 @@ class SessionManager(QObject):
                 lazy_index = i + 1
                 lazy_load.append({
                     'title': histentry['title'],
-                    'url': 'qute://back#' + histentry['title'],
+                    'url':
+                        'qute://back#' +
+                        urllib.parse.quote(histentry['title']),
                     'active': True
                 })
                 histentry['active'] = False

From 568d60753e4856e9f84921e1084ea23d4e9e5956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andor=20Uhl=C3=A1r?= <neferty@neferty.me>
Date: Sun, 10 May 2015 18:33:36 +0200
Subject: [PATCH 021/322] Add greasemonkey compatible userscript module.

WebKit backend only for now. Loads all .js files from a directory,
specified in the greasemonkey-directory key in the storage section,
defaulting to data/greasemonkey, and wraps them in a minimal environment
providing some GM_* functions. Makes those scripts available via the
"greasemonkey" registered object in objreg and injects scripts at appropriate
times in a page load base on @run-at directives.
---
 qutebrowser/browser/browsertab.py     |   6 +-
 qutebrowser/browser/greasemonkey.py   | 262 ++++++++++++++++++++++++++
 qutebrowser/browser/webkit/webpage.py |  28 +++
 qutebrowser/utils/log.py              |   4 +-
 4 files changed, 298 insertions(+), 2 deletions(-)
 create mode 100644 qutebrowser/browser/greasemonkey.py

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 547e276db..866943f87 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -31,7 +31,7 @@ from qutebrowser.keyinput import modeman
 from qutebrowser.config import config
 from qutebrowser.utils import utils, objreg, usertypes, log, qtutils
 from qutebrowser.misc import miscwidgets, objects
-from qutebrowser.browser import mouse, hints
+from qutebrowser.browser import mouse, hints, greasemonkey
 
 
 tab_id_gen = itertools.count(0)
@@ -64,6 +64,10 @@ def init():
         from qutebrowser.browser.webengine import webenginetab
         webenginetab.init()
 
+    log.init.debug("Initializing Greasemonkey...")
+    gm_manager = greasemonkey.GreasemonkeyManager()
+    objreg.register('greasemonkey', gm_manager)
+
 
 class WebTabError(Exception):
 
diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
new file mode 100644
index 000000000..d1f63a4a4
--- /dev/null
+++ b/qutebrowser/browser/greasemonkey.py
@@ -0,0 +1,262 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Load, parse and make avalaible greasemonkey scripts."""
+
+import re
+import os
+import json
+import fnmatch
+import functools
+import glob
+
+from PyQt5.QtCore import pyqtSignal, QObject
+
+from qutebrowser.utils import log, standarddir
+
+# TODO: GM_ bootstrap
+
+
+def _scripts_dir():
+    """Get the directory of the scripts."""
+    return os.path.join(standarddir.data(), 'greasemonkey')
+
+
+class GreasemonkeyScript:
+    """Container class for userscripts, parses metadata blocks."""
+
+    GM_BOOTSTRAP_TEMPLATE = r"""var _qute_script_id = "__gm_{scriptName}";
+
+function GM_log(text) {{
+    console.log(text);
+}}
+
+GM_info = (function() {{
+    return {{
+        'script': {scriptInfo},
+        'scriptMetaStr': {scriptMeta},
+        'scriptWillUpdate': false,
+        'version': '0.0.1',
+        'scriptHandler': 'Tampermonkey' //so scripts don't expect exportFunction
+    }};
+}}());
+
+function GM_setValue(key, value) {{
+    if (localStorage !== null &&
+        typeof key === "string" &&
+        (typeof value === "string" ||
+            typeof value === "number" ||
+            typeof value == "boolean")) {{
+        localStorage.setItem(_qute_script_id + key, value);
+    }}
+}}
+
+function GM_getValue(key, default_) {{
+    if (localStorage !== null && typeof key === "string") {{
+        return localStorage.getItem(_qute_script_id + key) || default_;
+    }}
+}}
+
+function GM_deleteValue(key) {{
+    if (localStorage !== null && typeof key === "string") {{
+        localStorage.removeItem(_qute_script_id + key);
+    }}
+}}
+
+function GM_listValues() {{
+    var i;
+    var keys = [];
+    for (i = 0; i < localStorage.length; ++i) {{
+        if (localStorage.key(i).startsWith(_qute_script_id)) {{
+            keys.push(localStorage.key(i));
+        }}
+    }}
+    return keys;
+}}
+
+function GM_openInTab(url) {{
+    window.open(url);
+}}
+
+
+// Almost verbatim copy from Eric
+function GM_xmlhttpRequest(/* object */ details) {{
+    details.method = details.method.toUpperCase() || "GET";
+
+    if(!details.url) {{
+        throw("GM_xmlhttpRequest requires an URL.");
+    }}
+
+    // build XMLHttpRequest object
+    var oXhr = new XMLHttpRequest;
+    // run it
+    if("onreadystatechange" in details)
+        oXhr.onreadystatechange = function() {{
+            details.onreadystatechange(oXhr)
+        }};
+    if("onload" in details)
+        oXhr.onload = function() {{ details.onload(oXhr) }};
+    if("onerror" in details)
+        oXhr.onerror = function() {{ details.onerror(oXhr) }};
+
+    oXhr.open(details.method, details.url, true);
+
+    if("headers" in details)
+        for(var header in details.headers)
+            oXhr.setRequestHeader(header, details.headers[header]);
+
+    if("data" in details)
+        oXhr.send(details.data);
+    else
+        oXhr.send();
+}}
+
+function GM_addStyle(/* String */ styles) {{
+    var head = document.getElementsByTagName("head")[0];
+    if (head === undefined) {{
+        document.onreadystatechange = function() {{
+            if (document.readyState == "interactive") {{
+                var oStyle = document.createElement("style");
+                oStyle.setAttribute("type", "text/css");
+                oStyle.appendChild(document.createTextNode(styles));
+                document.getElementsByTagName("head")[0].appendChild(oStyle);
+            }}
+        }}
+    }}
+    else {{
+        var oStyle = document.createElement("style");
+        oStyle.setAttribute("type", "text/css");
+        oStyle.appendChild(document.createTextNode(styles));
+        head.appendChild(oStyle);
+    }}
+}}
+
+unsafeWindow = window;
+"""
+
+    def __init__(self, properties, code):
+        self._code = code
+        self.includes = []
+        self.excludes = []
+        self.description = None
+        self.name = None
+        self.run_at = None
+        for name, value in properties:
+            if name == 'name':
+                self.name = value
+            elif name == 'description':
+                self.description = value
+            elif name in ['include', 'match']:
+                self.includes.append(value)
+            elif name in ['exclude', 'exclude_match']:
+                self.excludes.append(value)
+            elif name == 'run-at':
+                self.run_at = value
+
+    HEADER_REGEX = r'// ==UserScript==.|\n+// ==/UserScript==\n'
+    PROPS_REGEX = r'// @(?P<prop>[^\s]+)\s+(?P<val>.+)'
+
+    @classmethod
+    def parse(cls, source):
+        """GreaseMonkeyScript factory.
+
+        Takes a userscript source and returns a GreaseMonkeyScript.
+        Parses the greasemonkey metadata block, if present, to fill out
+        attributes.
+        """
+        matches = re.split(cls.HEADER_REGEX, source, maxsplit=1)
+        try:
+            props, _code = matches
+        except ValueError:
+            props = ""
+        script = cls(re.findall(cls.PROPS_REGEX, props), code)
+        script.script_meta = '"{}"'.format("\\n".join(props.split('\n')[2:]))
+        return script
+
+    def code(self):
+        """Return the processed javascript code of this script.
+
+        Adorns the source code with GM_* methods for greasemonkey
+        compatibility and wraps it in an IFFE to hide it within a
+        lexical scope. Note that this means line numbers in your
+        browser's debugger/inspector will not match up to the line
+        numbers in the source script directly.
+        """
+        gm_bootstrap = self.GM_BOOTSTRAP_TEMPLATE.format(
+            scriptName=self.name,
+            scriptInfo=self._meta_json(),
+            scriptMeta=self.script_meta)
+        return '\n'.join([gm_bootstrap, self._code])
+
+    def _meta_json(self):
+        return json.dumps({
+            'name': self.name,
+            'description': self.description,
+            'matches': self.includes,
+            'includes': self.includes,
+            'excludes': self.excludes,
+            'run-at': self.run_at,
+        })
+
+
+class GreasemonkeyManager:
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self._run_start = []
+        self._run_end = []
+
+        scripts_dir = os.path.abspath(_scripts_dir())
+        log.greasemonkey.debug("Reading scripts from: {}".format(scripts_dir))
+        for script_filename in glob.glob(os.path.join(scripts_dir, '*.js')):
+            if not os.path.isfile(script_filename):
+                continue
+            script_path = os.path.join(scripts_dir, script_filename)
+            with open(script_path, encoding='utf-8') as script_file:
+                script = GreasemonkeyScript.parse(script_file.read())
+                if not script.name:
+                    script.name = script_filename
+
+                if script.run_at == 'document-start':
+                    self._run_start.append(script)
+                elif script.run_at == 'document-end':
+                    self._run_end.append(script)
+                else:
+                    log.greasemonkey.warning("Script {} has invalid run-at "
+                                             "defined, ignoring."
+                                             .format(script_path))
+                    continue
+                log.greasemonkey.debug("Loaded script: {}".format(script.name))
+
+    def scripts_for(self, url):
+        """Fetch scripts that are registered to run for url.
+
+        returns a tuple of lists of scripts meant to run at (document-start,
+        document-end)
+        """
+        match = functools.partial(fnmatch.fnmatch, url)
+        tester = (lambda script:
+                  any(map(match, script.includes())) and not
+                  any(map(match, script.excludes())))
+        return (list(filter(tester, self._run_start)),
+                list(filter(tester, self._run_end)))
+
+    def all_scripts(self):
+        """Return all scripts found in the configured script directory."""
+        return self._run_start + self._run_end
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 7e1d991b9..9beba6ddc 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -86,6 +86,10 @@ class BrowserPage(QWebPage):
             self.on_save_frame_state_requested)
         self.restoreFrameStateRequested.connect(
             self.on_restore_frame_state_requested)
+        self.mainFrame().javaScriptWindowObjectCleared.connect(
+            functools.partial(self.inject_userjs, load='start'))
+        self.mainFrame().initialLayoutCompleted.connect(
+            functools.partial(self.inject_userjs, load='end'))
 
     def javaScriptPrompt(self, frame, js_msg, default):
         """Override javaScriptPrompt to use qutebrowser prompts."""
@@ -283,6 +287,30 @@ class BrowserPage(QWebPage):
         else:
             self.error_occurred = False
 
+    @pyqtSlot()
+    def inject_userjs(self, load):
+        """Inject user javascripts into the page.
+
+        param: The page load stage to inject the corresponding scripts
+               for. Support values are "start" and "end",
+               corresponding to the allowed values of the `@run-at`
+               directive in the greasemonkey metadata spec.
+        """
+        greasemonkey = objreg.get('greasemonkey')
+        url = self.currentFrame().url()
+        start_scripts, end_scripts = greasemonkey.scripts_for(url.toDisplayString())
+        log.greasemonkey.debug('scripts: {}'.format(start_scripts if start else end_scripts))
+
+        toload = []
+        if load == "start":
+            toload = start_scripts
+        elif load == "end":
+            toload = end_scripts
+
+        for script in toload:
+            log.webview.debug('Running GM script: {}'.format(script.name))
+            self.currentFrame().evaluateJavaScript(script.code())
+
     @pyqtSlot('QWebFrame*', 'QWebPage::Feature')
     def _on_feature_permission_requested(self, frame, feature):
         """Ask the user for approval for geolocation/notifications."""
diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py
index 68cf1d2ba..dc0ff5580 100644
--- a/qutebrowser/utils/log.py
+++ b/qutebrowser/utils/log.py
@@ -95,7 +95,8 @@ LOGGER_NAMES = [
     'commands', 'signals', 'downloads',
     'js', 'qt', 'rfc6266', 'ipc', 'shlexer',
     'save', 'message', 'config', 'sessions',
-    'webelem', 'prompt', 'network', 'sql'
+    'webelem', 'prompt', 'network', 'sql',
+    'greasemonkey'
 ]
 
 
@@ -144,6 +145,7 @@ webelem = logging.getLogger('webelem')
 prompt = logging.getLogger('prompt')
 network = logging.getLogger('network')
 sql = logging.getLogger('sql')
+greasemonkey = logging.getLogger('greasemonkey')
 
 
 ram_handler = None

From ecdde7663ffd44579c5935c5be78d92bc9816885 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 7 Jun 2017 15:40:14 +1200
Subject: [PATCH 022/322] Add greasemonkey-reload command.

Also add a signal to emit when scripts are reloaded. Had to make
GreasemonkeyManager inherit from QObject to get signals to work.
---
 qutebrowser/browser/greasemonkey.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index d1f63a4a4..d01a8f8e5 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -29,6 +29,7 @@ import glob
 from PyQt5.QtCore import pyqtSignal, QObject
 
 from qutebrowser.utils import log, standarddir
+from qutebrowser.commands import cmdutils
 
 # TODO: GM_ bootstrap
 
@@ -215,10 +216,26 @@ unsafeWindow = window;
         })
 
 
-class GreasemonkeyManager:
+class GreasemonkeyManager(QObject):
+
+    """Manager of userscripts and a greasemonkey compatible environment.
+
+    Signals:
+        scripts_reloaded: Emitted when scripts are reloaded from disk.
+            Any any cached or already-injected scripts should be
+            considered obselete.
+    """
+
+    scripts_reloaded = pyqtSignal()
 
     def __init__(self, parent=None):
         super().__init__(parent)
+        self.load_scripts()
+
+    @cmdutils.register(name='greasemonkey-reload',
+                       instance='greasemonkey')
+    def load_scripts(self):
+        """Re-Read greasemonkey scripts from disk."""
         self._run_start = []
         self._run_end = []
 
@@ -243,6 +260,7 @@ class GreasemonkeyManager:
                                              .format(script_path))
                     continue
                 log.greasemonkey.debug("Loaded script: {}".format(script.name))
+        self.scripts_reloaded.emit()
 
     def scripts_for(self, url):
         """Fetch scripts that are registered to run for url.

From 13728387d7d875bbe7bed5687330479e2e4bdc66 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 7 Jun 2017 15:41:53 +1200
Subject: [PATCH 023/322] Greasemonkey: Fix crash on undefined metadata.

---
 qutebrowser/browser/greasemonkey.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index d01a8f8e5..ef8635178 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -256,9 +256,12 @@ class GreasemonkeyManager(QObject):
                     self._run_end.append(script)
                 else:
                     log.greasemonkey.warning("Script {} has invalid run-at "
-                                             "defined, ignoring."
+                                             "defined, defaulting to "
+                                             "document-end"
                                              .format(script_path))
-                    continue
+                    # Default as per
+                    # https://wiki.greasespot.net/Metadata_Block#.40run-at
+                    self._run_end.append(script)
                 log.greasemonkey.debug("Loaded script: {}".format(script.name))
         self.scripts_reloaded.emit()
 

From 25f626a436d1f898391e19fb531984d28bb0547f Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 7 Jun 2017 15:45:12 +1200
Subject: [PATCH 024/322] Greasemonkey: Add run-at document-idle.

Supposed to be after all the assets have finished loading and in page js
has run. Not that we can garuntee that last bit. If a script misbehaves
because a precondition isn't yet met I suggest adding a defer method to
the script that adds a timer until the precondition is met.

Also changed the map/filter calls to use list comprehensions to keep
pylint happy. Even if it does look uglier.
---
 qutebrowser/browser/greasemonkey.py   | 18 ++++++++++++------
 qutebrowser/browser/webkit/webpage.py | 12 +++++++-----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index ef8635178..058a2d0f4 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -238,6 +238,7 @@ class GreasemonkeyManager(QObject):
         """Re-Read greasemonkey scripts from disk."""
         self._run_start = []
         self._run_end = []
+        self._run_idle = []
 
         scripts_dir = os.path.abspath(_scripts_dir())
         log.greasemonkey.debug("Reading scripts from: {}".format(scripts_dir))
@@ -254,6 +255,8 @@ class GreasemonkeyManager(QObject):
                     self._run_start.append(script)
                 elif script.run_at == 'document-end':
                     self._run_end.append(script)
+                elif script.run_at == 'document-idle':
+                    self._run_idle.append(script)
                 else:
                     log.greasemonkey.warning("Script {} has invalid run-at "
                                              "defined, defaulting to "
@@ -269,15 +272,18 @@ class GreasemonkeyManager(QObject):
         """Fetch scripts that are registered to run for url.
 
         returns a tuple of lists of scripts meant to run at (document-start,
-        document-end)
+        document-end, document-idle)
         """
         match = functools.partial(fnmatch.fnmatch, url)
         tester = (lambda script:
-                  any(map(match, script.includes())) and not
-                  any(map(match, script.excludes())))
-        return (list(filter(tester, self._run_start)),
-                list(filter(tester, self._run_end)))
+                  any([match(pat) for pat in script.includes]) and
+                  not any([match(pat) for pat in script.excludes]))
+        return (
+            [script for script in self._run_start if tester(script)],
+            [script for script in self._run_end if tester(script)],
+            [script for script in self._run_idle if tester(script)]
+        )
 
     def all_scripts(self):
         """Return all scripts found in the configured script directory."""
-        return self._run_start + self._run_end
+        return self._run_start + self._run_end + self._run_idle
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 9beba6ddc..095e41fe2 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -90,6 +90,8 @@ class BrowserPage(QWebPage):
             functools.partial(self.inject_userjs, load='start'))
         self.mainFrame().initialLayoutCompleted.connect(
             functools.partial(self.inject_userjs, load='end'))
+        self.mainFrame().loadFinished.connect(
+            functools.partial(self.inject_userjs, load='idle'))
 
     def javaScriptPrompt(self, frame, js_msg, default):
         """Override javaScriptPrompt to use qutebrowser prompts."""
@@ -292,20 +294,20 @@ class BrowserPage(QWebPage):
         """Inject user javascripts into the page.
 
         param: The page load stage to inject the corresponding scripts
-               for. Support values are "start" and "end",
+               for. Support values are "start", "end" and "idle",
                corresponding to the allowed values of the `@run-at`
                directive in the greasemonkey metadata spec.
         """
         greasemonkey = objreg.get('greasemonkey')
         url = self.currentFrame().url()
-        start_scripts, end_scripts = greasemonkey.scripts_for(url.toDisplayString())
-        log.greasemonkey.debug('scripts: {}'.format(start_scripts if start else end_scripts))
-
-        toload = []
+        start_scripts, end_scripts, idle_scripts = \
+            greasemonkey.scripts_for(url.toDisplayString())
         if load == "start":
             toload = start_scripts
         elif load == "end":
             toload = end_scripts
+        elif load == "idle":
+            toload = idle_scripts
 
         for script in toload:
             log.webview.debug('Running GM script: {}'.format(script.name))

From be9f8bd0de2d8189852bb306ebd25c010bc15c76 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 7 Jun 2017 15:49:41 +1200
Subject: [PATCH 025/322] Greasemonkey: Lift greasemonkey init app.py

To prepare for multiple-backend support.
---
 qutebrowser/app.py                | 6 +++++-
 qutebrowser/browser/browsertab.py | 6 +-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 2ed579f61..c32a208ac 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -64,7 +64,7 @@ from qutebrowser.completion.models import miscmodels
 from qutebrowser.commands import cmdutils, runners, cmdexc
 from qutebrowser.config import config, websettings, configfiles, configinit
 from qutebrowser.browser import (urlmarks, adblock, history, browsertab,
-                                 downloads)
+                                 downloads, greasemonkey)
 from qutebrowser.browser.network import proxy
 from qutebrowser.browser.webkit import cookies, cache
 from qutebrowser.browser.webkit.network import networkmanager
@@ -491,6 +491,10 @@ def _init_modules(args, crash_handler):
     diskcache = cache.DiskCache(standarddir.cache(), parent=qApp)
     objreg.register('cache', diskcache)
 
+    log.init.debug("Initializing Greasemonkey...")
+    gm_manager = greasemonkey.GreasemonkeyManager()
+    objreg.register('greasemonkey', gm_manager)
+
     log.init.debug("Misc initialization...")
     macros.init()
     # Init backend-specific stuff
diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 866943f87..547e276db 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -31,7 +31,7 @@ from qutebrowser.keyinput import modeman
 from qutebrowser.config import config
 from qutebrowser.utils import utils, objreg, usertypes, log, qtutils
 from qutebrowser.misc import miscwidgets, objects
-from qutebrowser.browser import mouse, hints, greasemonkey
+from qutebrowser.browser import mouse, hints
 
 
 tab_id_gen = itertools.count(0)
@@ -64,10 +64,6 @@ def init():
         from qutebrowser.browser.webengine import webenginetab
         webenginetab.init()
 
-    log.init.debug("Initializing Greasemonkey...")
-    gm_manager = greasemonkey.GreasemonkeyManager()
-    objreg.register('greasemonkey', gm_manager)
-
 
 class WebTabError(Exception):
 

From f26377351c0fc8b2e50b583ec7eb8b195d76501c Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 7 Jun 2017 16:06:50 +1200
Subject: [PATCH 026/322] Greasemonkey: Add greasemonkey hooks for webengine.

For qtwebengine 5.8+ only. This is because as of 5.8 some greasemonkey
script support is in upstream. That is, qtwebenginescript(collection)
parses the greasemonkey metadata block and uses @include/match/exclude
to decide what sites to inject a script onto and @run-at to decide when
to inject it, which saves us the trouble. Notes on doing this in <5.8
are below.

Scripts are currently injected into the main "world", that is the same
world as the javascript from the page. This is good because it means
userscripts can modify more stuff on the page but it would be nice if we
could have more isolation without sacrificing functionality. I'm still
looking into why my more feature-full scripts are not having any effect
on the page while running in a separate world.

Userscripts are added to both the default and private profile because I
that if people have scripts installed they want them to run in private mode
too.

We are grabbing the scripts from the greasemonkey module, as opposed to
reading them directly from disk, because the module adds some GM_* functions
that the scripts may expect, and because that is used for webkit anyway.

I have code to support qtwebengine <5.8 but didn't because I am not
happy with the timing of some of the signals that we are provided
regarding page load state, and the actual load state. While the
difference between document-end and document-idle isn't so bad,
injecting document-start scripts when a urlChanged event is emitted
results in the script being injected into the environment for the page
being navigated away from. Anyway, if anyone wants this for earlier
webengines I can oblige them.
---
 qutebrowser/browser/webengine/webenginetab.py | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 89ba958a7..c8d7ef670 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -69,6 +69,10 @@ def init():
     download_manager.install(webenginesettings.private_profile)
     objreg.register('webengine-download-manager', download_manager)
 
+    greasemonkey = objreg.get('greasemonkey')
+    greasemonkey.scripts_reloaded.connect(inject_userscripts)
+    inject_userscripts()
+
 
 # Mapping worlds from usertypes.JsWorld to QWebEngineScript world IDs.
 _JS_WORLD_MAP = {
@@ -79,6 +83,42 @@ _JS_WORLD_MAP = {
 }
 
 
+def inject_userscripts():
+    """Register user javascript files with the global profiles."""
+    # The greasemonkey metadata block support in qtwebengine only starts at 5.8
+    # Otherwise have to handle injecting the scripts into the page at very
+    # early load, probs same place in view as the enableJS check.
+    if not qtutils.version_check('5.8'):
+        return
+
+    # Since we are inserting scripts into profile.scripts they won't
+    # just get replaced by new gm scripts like if we were injecting them
+    # ourselves so we need to remove all gm scripts, while not removing
+    # any other stuff that might have been added. Like the one for
+    # stylsheets.
+    # Could either use a different world for gm scripts, check for gm metadata
+    # values (would mean no non-gm userscripts), or check the code for
+    # _qute_script_id
+    for profile in [webenginesettings.default_profile,
+                    webenginesettings.private_profile]:
+        scripts = profile.scripts()
+        for script in scripts.toList():
+            if script.worldId() == QWebEngineScript.MainWorld:
+                scripts.remove(script)
+
+    # Should we be adding to private profile too?
+    for profile in [webenginesettings.default_profile,
+                    webenginesettings.private_profile]:
+        scripts = profile.scripts()
+        greasemonkey = objreg.get('greasemonkey')
+        for script in greasemonkey.all_scripts():
+            new_script = QWebEngineScript()
+            new_script.setWorldId(QWebEngineScript.MainWorld)
+            new_script.setSourceCode(script.code())
+            log.greasemonkey.debug('adding script: %s', new_script.name)
+            scripts.insert(new_script)
+
+
 class WebEngineAction(browsertab.AbstractAction):
 
     """QtWebEngine implementations related to web actions."""

From 325c595b896ded73d324b8a2a9c178b5ef1fd604 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Thu, 27 Jul 2017 19:25:29 +1200
Subject: [PATCH 027/322] Greasemonkey: Don't strip gm metadata from scripts
 when loading.

Since we just pass them to webenginescriptcollection on that backend and
that wants to parse it itself to figure out injection point etc.
---
 qutebrowser/browser/greasemonkey.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 058a2d0f4..a616891d1 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -31,8 +31,6 @@ from PyQt5.QtCore import pyqtSignal, QObject
 from qutebrowser.utils import log, standarddir
 from qutebrowser.commands import cmdutils
 
-# TODO: GM_ bootstrap
-
 
 def _scripts_dir():
     """Get the directory of the scripts."""
@@ -186,7 +184,7 @@ unsafeWindow = window;
             props, _code = matches
         except ValueError:
             props = ""
-        script = cls(re.findall(cls.PROPS_REGEX, props), code)
+        script = cls(re.findall(cls.PROPS_REGEX, props), source)
         script.script_meta = '"{}"'.format("\\n".join(props.split('\n')[2:]))
         return script
 

From 799730f6864ad8f41365542d5c393ecbd52f7155 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Thu, 27 Jul 2017 21:21:21 +1200
Subject: [PATCH 028/322] Remove GM_ and userscript variables from global
 scope.

---
 qutebrowser/browser/greasemonkey.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index a616891d1..41d32bcf1 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -201,7 +201,8 @@ unsafeWindow = window;
             scriptName=self.name,
             scriptInfo=self._meta_json(),
             scriptMeta=self.script_meta)
-        return '\n'.join([gm_bootstrap, self._code])
+        return '\n'.join(
+            ["(function(){", gm_bootstrap, self._code, "})();"])
 
     def _meta_json(self):
         return json.dumps({

From 41035cb5cab72ab3c4acfb06330eab6e7b8f25b4 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Sun, 5 Nov 2017 16:36:09 +1300
Subject: [PATCH 029/322] Greasemonkey: restrict page schemes that scripts can
 run on

Scripts shouldn't run on qute://settings or source:// etc.

Whitelist from:
https://wiki.greasespot.net/Include_and_exclude_rules
---
 qutebrowser/browser/greasemonkey.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 41d32bcf1..4a8d9bdeb 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -226,6 +226,10 @@ class GreasemonkeyManager(QObject):
     """
 
     scripts_reloaded = pyqtSignal()
+    # https://wiki.greasespot.net/Include_and_exclude_rules#Greaseable_schemes
+    # Limit the schemes scripts can run on due to unreasonable levels of
+    # exploitability
+    greaseable_schemes = ['http', 'https', 'ftp', 'file']
 
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -273,6 +277,8 @@ class GreasemonkeyManager(QObject):
         returns a tuple of lists of scripts meant to run at (document-start,
         document-end, document-idle)
         """
+        if url.split(':', 1)[0] not in self.greaseable_schemes:
+            return [], [], []
         match = functools.partial(fnmatch.fnmatch, url)
         tester = (lambda script:
                   any([match(pat) for pat in script.includes]) and

From edf737ff7d604a3d14a26eb23b0b0a94f9328230 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 4 Oct 2017 20:42:10 +1300
Subject: [PATCH 030/322] Greasemonkey: move scripts for a domain into data
 class.

Also makes scripts that don't include a greasemonkey metadata block
match any url. QWebEngine already has that behaviour.
---
 qutebrowser/browser/greasemonkey.py   | 18 ++++++++++++++++--
 qutebrowser/browser/webkit/webpage.py | 10 +++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 4a8d9bdeb..d06bc9cac 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -26,6 +26,7 @@ import fnmatch
 import functools
 import glob
 
+import attr
 from PyQt5.QtCore import pyqtSignal, QObject
 
 from qutebrowser.utils import log, standarddir
@@ -186,6 +187,8 @@ unsafeWindow = window;
             props = ""
         script = cls(re.findall(cls.PROPS_REGEX, props), source)
         script.script_meta = '"{}"'.format("\\n".join(props.split('\n')[2:]))
+        if not props:
+            script.includes = ['*']
         return script
 
     def code(self):
@@ -215,6 +218,16 @@ unsafeWindow = window;
         })
 
 
+@attr.s
+class MatchingScripts(object):
+    """All userscripts registered to run on a particular url."""
+
+    url = attr.ib()
+    start = attr.ib(default=attr.Factory(list))
+    end = attr.ib(default=attr.Factory(list))
+    idle = attr.ib(default=attr.Factory(list))
+
+
 class GreasemonkeyManager(QObject):
 
     """Manager of userscripts and a greasemonkey compatible environment.
@@ -278,12 +291,13 @@ class GreasemonkeyManager(QObject):
         document-end, document-idle)
         """
         if url.split(':', 1)[0] not in self.greaseable_schemes:
-            return [], [], []
+            return MatchingScripts(url, [], [], [])
         match = functools.partial(fnmatch.fnmatch, url)
         tester = (lambda script:
                   any([match(pat) for pat in script.includes]) and
                   not any([match(pat) for pat in script.excludes]))
-        return (
+        return MatchingScripts(
+            url,
             [script for script in self._run_start if tester(script)],
             [script for script in self._run_end if tester(script)],
             [script for script in self._run_idle if tester(script)]
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 095e41fe2..15f662e61 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -300,14 +300,14 @@ class BrowserPage(QWebPage):
         """
         greasemonkey = objreg.get('greasemonkey')
         url = self.currentFrame().url()
-        start_scripts, end_scripts, idle_scripts = \
-            greasemonkey.scripts_for(url.toDisplayString())
+        scripts = greasemonkey.scripts_for(url.toDisplayString())
+
         if load == "start":
-            toload = start_scripts
+            toload = scripts.start
         elif load == "end":
-            toload = end_scripts
+            toload = scripts.end
         elif load == "idle":
-            toload = idle_scripts
+            toload = scripts.idle
 
         for script in toload:
             log.webview.debug('Running GM script: {}'.format(script.name))

From c1b912f5670756b6a96ba378e60e83e9df64ba98 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 4 Oct 2017 21:24:16 +1300
Subject: [PATCH 031/322] Greasemonkey: move inject_userscripts into
 webenginesettings

---
 .../browser/webengine/webenginesettings.py    | 33 +++++++++++++++
 qutebrowser/browser/webengine/webenginetab.py | 40 +------------------
 2 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index 4bf525c46..5ce4e1a05 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -244,6 +244,39 @@ def _init_profiles():
         private_profile.setSpellCheckEnabled(True)
 
 
+def inject_userscripts():
+    """Register user javascript files with the global profiles."""
+    # The greasemonkey metadata block support in qtwebengine only starts at 5.8
+    # Otherwise have to handle injecting the scripts into the page at very
+    # early load, probs same place in view as the enableJS check.
+    if not qtutils.version_check('5.8'):
+        return
+
+    # Since we are inserting scripts into profile.scripts they won't
+    # just get replaced by new gm scripts like if we were injecting them
+    # ourselves so we need to remove all gm scripts, while not removing
+    # any other stuff that might have been added. Like the one for
+    # stylsheets.
+    # Could either use a different world for gm scripts, check for gm metadata
+    # values (would mean no non-gm userscripts), or check the code for
+    # _qute_script_id
+    for profile in [default_profile, private_profile]:
+        scripts = profile.scripts()
+        for script in scripts.toList():
+            if script.worldId() == QWebEngineScript.MainWorld:
+                scripts.remove(script)
+
+    for profile in [default_profile, private_profile]:
+        scripts = profile.scripts()
+        greasemonkey = objreg.get('greasemonkey')
+        for script in greasemonkey.all_scripts():
+            new_script = QWebEngineScript()
+            new_script.setWorldId(QWebEngineScript.MainWorld)
+            new_script.setSourceCode(script.code())
+            log.greasemonkey.debug('adding script: %s', new_script.name())
+            scripts.insert(new_script)
+
+
 def init(args):
     """Initialize the global QWebSettings."""
     if args.enable_webengine_inspector:
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index c8d7ef670..c97aaacbe 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -70,8 +70,8 @@ def init():
     objreg.register('webengine-download-manager', download_manager)
 
     greasemonkey = objreg.get('greasemonkey')
-    greasemonkey.scripts_reloaded.connect(inject_userscripts)
-    inject_userscripts()
+    greasemonkey.scripts_reloaded.connect(webenginesettings.inject_userscripts)
+    webenginesettings.inject_userscripts()
 
 
 # Mapping worlds from usertypes.JsWorld to QWebEngineScript world IDs.
@@ -83,42 +83,6 @@ _JS_WORLD_MAP = {
 }
 
 
-def inject_userscripts():
-    """Register user javascript files with the global profiles."""
-    # The greasemonkey metadata block support in qtwebengine only starts at 5.8
-    # Otherwise have to handle injecting the scripts into the page at very
-    # early load, probs same place in view as the enableJS check.
-    if not qtutils.version_check('5.8'):
-        return
-
-    # Since we are inserting scripts into profile.scripts they won't
-    # just get replaced by new gm scripts like if we were injecting them
-    # ourselves so we need to remove all gm scripts, while not removing
-    # any other stuff that might have been added. Like the one for
-    # stylsheets.
-    # Could either use a different world for gm scripts, check for gm metadata
-    # values (would mean no non-gm userscripts), or check the code for
-    # _qute_script_id
-    for profile in [webenginesettings.default_profile,
-                    webenginesettings.private_profile]:
-        scripts = profile.scripts()
-        for script in scripts.toList():
-            if script.worldId() == QWebEngineScript.MainWorld:
-                scripts.remove(script)
-
-    # Should we be adding to private profile too?
-    for profile in [webenginesettings.default_profile,
-                    webenginesettings.private_profile]:
-        scripts = profile.scripts()
-        greasemonkey = objreg.get('greasemonkey')
-        for script in greasemonkey.all_scripts():
-            new_script = QWebEngineScript()
-            new_script.setWorldId(QWebEngineScript.MainWorld)
-            new_script.setSourceCode(script.code())
-            log.greasemonkey.debug('adding script: %s', new_script.name)
-            scripts.insert(new_script)
-
-
 class WebEngineAction(browsertab.AbstractAction):
 
     """QtWebEngine implementations related to web actions."""

From fd5d44182ba53e6e3c5fb8c71ffe15d3c44aeeaa Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 4 Oct 2017 22:39:32 +1300
Subject: [PATCH 032/322] Greasemonkey: move GM_* template into seperate file.

Also ported it to jinja rather than str.format().

Also ran the js through jslint and fixed up a few very minor things.
---
 qutebrowser/browser/greasemonkey.py           | 123 +-----------------
 qutebrowser/javascript/.eslintignore          |   2 +
 .../javascript/greasemonkey_wrapper.js        | 118 +++++++++++++++++
 qutebrowser/utils/jinja.py                    |   1 +
 4 files changed, 128 insertions(+), 116 deletions(-)
 create mode 100644 qutebrowser/javascript/greasemonkey_wrapper.js

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index d06bc9cac..e1f0b57db 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -29,7 +29,7 @@ import glob
 import attr
 from PyQt5.QtCore import pyqtSignal, QObject
 
-from qutebrowser.utils import log, standarddir
+from qutebrowser.utils import log, standarddir, jinja
 from qutebrowser.commands import cmdutils
 
 
@@ -41,115 +41,6 @@ def _scripts_dir():
 class GreasemonkeyScript:
     """Container class for userscripts, parses metadata blocks."""
 
-    GM_BOOTSTRAP_TEMPLATE = r"""var _qute_script_id = "__gm_{scriptName}";
-
-function GM_log(text) {{
-    console.log(text);
-}}
-
-GM_info = (function() {{
-    return {{
-        'script': {scriptInfo},
-        'scriptMetaStr': {scriptMeta},
-        'scriptWillUpdate': false,
-        'version': '0.0.1',
-        'scriptHandler': 'Tampermonkey' //so scripts don't expect exportFunction
-    }};
-}}());
-
-function GM_setValue(key, value) {{
-    if (localStorage !== null &&
-        typeof key === "string" &&
-        (typeof value === "string" ||
-            typeof value === "number" ||
-            typeof value == "boolean")) {{
-        localStorage.setItem(_qute_script_id + key, value);
-    }}
-}}
-
-function GM_getValue(key, default_) {{
-    if (localStorage !== null && typeof key === "string") {{
-        return localStorage.getItem(_qute_script_id + key) || default_;
-    }}
-}}
-
-function GM_deleteValue(key) {{
-    if (localStorage !== null && typeof key === "string") {{
-        localStorage.removeItem(_qute_script_id + key);
-    }}
-}}
-
-function GM_listValues() {{
-    var i;
-    var keys = [];
-    for (i = 0; i < localStorage.length; ++i) {{
-        if (localStorage.key(i).startsWith(_qute_script_id)) {{
-            keys.push(localStorage.key(i));
-        }}
-    }}
-    return keys;
-}}
-
-function GM_openInTab(url) {{
-    window.open(url);
-}}
-
-
-// Almost verbatim copy from Eric
-function GM_xmlhttpRequest(/* object */ details) {{
-    details.method = details.method.toUpperCase() || "GET";
-
-    if(!details.url) {{
-        throw("GM_xmlhttpRequest requires an URL.");
-    }}
-
-    // build XMLHttpRequest object
-    var oXhr = new XMLHttpRequest;
-    // run it
-    if("onreadystatechange" in details)
-        oXhr.onreadystatechange = function() {{
-            details.onreadystatechange(oXhr)
-        }};
-    if("onload" in details)
-        oXhr.onload = function() {{ details.onload(oXhr) }};
-    if("onerror" in details)
-        oXhr.onerror = function() {{ details.onerror(oXhr) }};
-
-    oXhr.open(details.method, details.url, true);
-
-    if("headers" in details)
-        for(var header in details.headers)
-            oXhr.setRequestHeader(header, details.headers[header]);
-
-    if("data" in details)
-        oXhr.send(details.data);
-    else
-        oXhr.send();
-}}
-
-function GM_addStyle(/* String */ styles) {{
-    var head = document.getElementsByTagName("head")[0];
-    if (head === undefined) {{
-        document.onreadystatechange = function() {{
-            if (document.readyState == "interactive") {{
-                var oStyle = document.createElement("style");
-                oStyle.setAttribute("type", "text/css");
-                oStyle.appendChild(document.createTextNode(styles));
-                document.getElementsByTagName("head")[0].appendChild(oStyle);
-            }}
-        }}
-    }}
-    else {{
-        var oStyle = document.createElement("style");
-        oStyle.setAttribute("type", "text/css");
-        oStyle.appendChild(document.createTextNode(styles));
-        head.appendChild(oStyle);
-    }}
-}}
-
-unsafeWindow = window;
-"""
-
     def __init__(self, properties, code):
         self._code = code
         self.includes = []
@@ -200,12 +91,12 @@ unsafeWindow = window;
         browser's debugger/inspector will not match up to the line
         numbers in the source script directly.
         """
-        gm_bootstrap = self.GM_BOOTSTRAP_TEMPLATE.format(
-            scriptName=self.name,
-            scriptInfo=self._meta_json(),
-            scriptMeta=self.script_meta)
-        return '\n'.join(
-            ["(function(){", gm_bootstrap, self._code, "})();"])
+        return jinja.js_environment.get_template(
+            'greasemonkey_wrapper.js').render(
+                scriptName=self.name,
+                scriptInfo=self._meta_json(),
+                scriptMeta=self.script_meta,
+                scriptSource=self._code)
 
     def _meta_json(self):
         return json.dumps({
diff --git a/qutebrowser/javascript/.eslintignore b/qutebrowser/javascript/.eslintignore
index ca4d3c667..036a72cfe 100644
--- a/qutebrowser/javascript/.eslintignore
+++ b/qutebrowser/javascript/.eslintignore
@@ -1,2 +1,4 @@
 # Upstream Mozilla's code
 pac_utils.js
+# Actually a jinja template so eslint chokes on the {{}} syntax.
+greasemonkey_wrapper.js
diff --git a/qutebrowser/javascript/greasemonkey_wrapper.js b/qutebrowser/javascript/greasemonkey_wrapper.js
new file mode 100644
index 000000000..b49dc2c02
--- /dev/null
+++ b/qutebrowser/javascript/greasemonkey_wrapper.js
@@ -0,0 +1,118 @@
+(function () {
+    var _qute_script_id = "__gm_{{ scriptName }}";
+
+    function GM_log(text) {
+        console.log(text);
+    }
+
+    var GM_info = (function () {
+        return {
+            'script': {{ scriptInfo }},
+            'scriptMetaStr': {{ scriptMeta }},
+            'scriptWillUpdate': false,
+            'version': '0.0.1',
+            'scriptHandler': 'Tampermonkey' // so scripts don't expect exportFunction
+        };
+    }());
+
+    function GM_setValue(key, value) {
+        if (localStorage !== null &&
+                typeof key === "string" &&
+                (typeof value === "string" ||
+                 typeof value === "number" ||
+                 typeof value === "boolean")) {
+            localStorage.setItem(_qute_script_id + key, value);
+        }
+    }
+
+    function GM_getValue(key, default_) {
+        if (localStorage !== null && typeof key === "string") {
+            return localStorage.getItem(_qute_script_id + key) || default_;
+        }
+    }
+
+    function GM_deleteValue(key) {
+        if (localStorage !== null && typeof key === "string") {
+            localStorage.removeItem(_qute_script_id + key);
+        }
+    }
+
+    function GM_listValues() {
+        var i, keys = [];
+        for (i = 0; i < localStorage.length; i = i + 1) {
+            if (localStorage.key(i).startsWith(_qute_script_id)) {
+                keys.push(localStorage.key(i));
+            }
+        }
+        return keys;
+    }
+
+    function GM_openInTab(url) {
+        window.open(url);
+    }
+
+
+    // Almost verbatim copy from Eric
+    function GM_xmlhttpRequest(/* object */ details) {
+        details.method = details.method.toUpperCase() || "GET";
+
+        if (!details.url) {
+            throw ("GM_xmlhttpRequest requires an URL.");
+        }
+
+        // build XMLHttpRequest object
+        var oXhr = new XMLHttpRequest();
+        // run it
+        if ("onreadystatechange" in details) {
+            oXhr.onreadystatechange = function () {
+                details.onreadystatechange(oXhr);
+            };
+        }
+        if ("onload" in details) {
+            oXhr.onload = function () { details.onload(oXhr) };
+        }
+        if ("onerror" in details) {
+            oXhr.onerror = function () { details.onerror(oXhr) };
+        }
+
+        oXhr.open(details.method, details.url, true);
+
+        if ("headers" in details) {
+            for (var header in details.headers) {
+                oXhr.setRequestHeader(header, details.headers[header]);
+            }
+        }
+
+        if ("data" in details) {
+            oXhr.send(details.data);
+        } else {
+            oXhr.send();
+        }
+    }
+
+    function GM_addStyle(/* String */ styles) {
+        var head = document.getElementsByTagName("head")[0];
+        if (head === undefined) {
+            document.onreadystatechange = function () {
+                if (document.readyState == "interactive") {
+                    var oStyle = document.createElement("style");
+                    oStyle.setAttribute("type", "text/css");
+                    oStyle.appendChild(document.createTextNode(styles));
+                    document.getElementsByTagName("head")[0].appendChild(oStyle);
+                }
+            }
+        }
+        else {
+            var oStyle = document.createElement("style");
+            oStyle.setAttribute("type", "text/css");
+            oStyle.appendChild(document.createTextNode(styles));
+            head.appendChild(oStyle);
+        }
+    }
+
+    unsafeWindow = window;
+
+    //====== The actual user script source ======//
+{{ scriptSource }}
+    //====== End User Script ======//
+})();
diff --git a/qutebrowser/utils/jinja.py b/qutebrowser/utils/jinja.py
index e7b536b60..b6f53645b 100644
--- a/qutebrowser/utils/jinja.py
+++ b/qutebrowser/utils/jinja.py
@@ -136,3 +136,4 @@ def render(template, **kwargs):
 
 
 environment = Environment()
+js_environment = jinja2.Environment(loader=Loader('javascript'))

From a7f41b4564dd39247893662ebeb23170a290c85f Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 4 Oct 2017 23:25:22 +1300
Subject: [PATCH 033/322] Greasemonkey: ensure only GM scripts are cleaned up
 on reload.

WebEngine only. Previously we were just removing every script from the
main world. But some other scripts might got here in the future so new
we are overriding the name field to add a GM- prefix so hopefully we
only remove greasemonkey scripts before adding new ones.
---
 qutebrowser/browser/webengine/webenginesettings.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index 5ce4e1a05..18ba98fd6 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -263,7 +263,9 @@ def inject_userscripts():
     for profile in [default_profile, private_profile]:
         scripts = profile.scripts()
         for script in scripts.toList():
-            if script.worldId() == QWebEngineScript.MainWorld:
+            if script.name().startswith("GM-"):
+                log.greasemonkey.debug('removing script: {}'
+                                       .format(script.name()))
                 scripts.remove(script)
 
     for profile in [default_profile, private_profile]:
@@ -273,6 +275,7 @@ def inject_userscripts():
             new_script = QWebEngineScript()
             new_script.setWorldId(QWebEngineScript.MainWorld)
             new_script.setSourceCode(script.code())
+            new_script.setName("GM-{}".format(script.name))
             log.greasemonkey.debug('adding script: %s', new_script.name())
             scripts.insert(new_script)
 

From d93c583c0d8f1859be2e306f21477ee2444b2d83 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Sat, 7 Oct 2017 17:18:48 +1300
Subject: [PATCH 034/322] Greasemonkey: Escape jinja variables for JS strings.

---
 qutebrowser/javascript/greasemonkey_wrapper.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/javascript/greasemonkey_wrapper.js b/qutebrowser/javascript/greasemonkey_wrapper.js
index b49dc2c02..a5079b89a 100644
--- a/qutebrowser/javascript/greasemonkey_wrapper.js
+++ b/qutebrowser/javascript/greasemonkey_wrapper.js
@@ -1,5 +1,5 @@
 (function () {
-    var _qute_script_id = "__gm_{{ scriptName }}";
+    var _qute_script_id = "__gm_"+{{ scriptName | tojson }};
 
     function GM_log(text) {
         console.log(text);
@@ -7,8 +7,8 @@
 
     var GM_info = (function () {
         return {
-            'script': {{ scriptInfo }},
-            'scriptMetaStr': {{ scriptMeta }},
+            'script': {{ scriptInfo | tojson }},
+            'scriptMetaStr': {{ scriptMeta | tojson }},
             'scriptWillUpdate': false,
             'version': '0.0.1',
             'scriptHandler': 'Tampermonkey' // so scripts don't expect exportFunction

From 5e49e7eef21ef1abaf327b1c060145f67ba6f868 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Sat, 7 Oct 2017 17:22:57 +1300
Subject: [PATCH 035/322] Greasemonkey: Throw Errors if GM_ function args wrong
 type.

These argument type restrictions are mentioned on the greasespot pages for
these value storage functions. We could call JSON.dumps() instead but better
to push that onto the caller so we don't have to try handle deserialization.

Also removes the check for localstorage because everyone has supported that
for years.
---
 .../javascript/greasemonkey_wrapper.js        | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/qutebrowser/javascript/greasemonkey_wrapper.js b/qutebrowser/javascript/greasemonkey_wrapper.js
index a5079b89a..605f82d5a 100644
--- a/qutebrowser/javascript/greasemonkey_wrapper.js
+++ b/qutebrowser/javascript/greasemonkey_wrapper.js
@@ -16,25 +16,29 @@
     }());
 
     function GM_setValue(key, value) {
-        if (localStorage !== null &&
-                typeof key === "string" &&
-                (typeof value === "string" ||
-                 typeof value === "number" ||
-                 typeof value === "boolean")) {
-            localStorage.setItem(_qute_script_id + key, value);
+        if (typeof key !== "string") {
+          throw new Error("GM_setValue requires the first parameter to be of type string, not '"+typeof key+"'");
         }
+        if (typeof value !== "string" ||
+            typeof value !== "number" ||
+            typeof value !== "boolean") {
+          throw new Error("GM_setValue requires the second parameter to be of type string, number or boolean, not '"+typeof value+"'");
+        }
+        localStorage.setItem(_qute_script_id + key, value);
     }
 
     function GM_getValue(key, default_) {
-        if (localStorage !== null && typeof key === "string") {
-            return localStorage.getItem(_qute_script_id + key) || default_;
+        if (typeof key !== "string") {
+          throw new Error("GM_getValue requires the first parameter to be of type string, not '"+typeof key+"'");
         }
+        return localStorage.getItem(_qute_script_id + key) || default_;
     }
 
     function GM_deleteValue(key) {
-        if (localStorage !== null && typeof key === "string") {
-            localStorage.removeItem(_qute_script_id + key);
+        if (typeof key !== "string") {
+          throw new Error("GM_deleteValue requires the first parameter to be of type string, not '"+typeof key+"'");
         }
+        localStorage.removeItem(_qute_script_id + key);
     }
 
     function GM_listValues() {

From d318178567f8e4236ded6ff350628127d4be7496 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Sat, 7 Oct 2017 17:32:21 +1300
Subject: [PATCH 036/322] Greasemonkey: Fix metadata block regex.

This regex was broken since the original PR and subsequent code seemed to be
working around it. Before re.split was returning [everything up to
/UserScript, everything else], now it returns [before UserScript, metadata,
after /UserScript], which is good.

Also I added the check for the UserScript line starting at column 0 as per
spec.
---
 qutebrowser/browser/greasemonkey.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index e1f0b57db..a0eb109fd 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -60,7 +60,7 @@ class GreasemonkeyScript:
             elif name == 'run-at':
                 self.run_at = value
 
-    HEADER_REGEX = r'// ==UserScript==.|\n+// ==/UserScript==\n'
+    HEADER_REGEX = r'// ==UserScript==|\n+// ==/UserScript==\n'
     PROPS_REGEX = r'// @(?P<prop>[^\s]+)\s+(?P<val>.+)'
 
     @classmethod
@@ -71,13 +71,13 @@ class GreasemonkeyScript:
         Parses the greasemonkey metadata block, if present, to fill out
         attributes.
         """
-        matches = re.split(cls.HEADER_REGEX, source, maxsplit=1)
+        matches = re.split(cls.HEADER_REGEX, source, maxsplit=2)
         try:
-            props, _code = matches
+            _, props, _code = matches
         except ValueError:
             props = ""
         script = cls(re.findall(cls.PROPS_REGEX, props), source)
-        script.script_meta = '"{}"'.format("\\n".join(props.split('\n')[2:]))
+        script.script_meta = props
         if not props:
             script.includes = ['*']
         return script

From 209e43e0baa0eda4c3258abc2dad75618020db99 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Sat, 7 Oct 2017 17:33:00 +1300
Subject: [PATCH 037/322] Greasemonkey: Match against percent encoded urls
 only.

This change requires urls specified in @include, @exclude and @matches
directives in metadata blocks to be in the same form that
QUrl.toEncoded() returns. That is a punycoded domain and percent encoded
path and query. This seems to be what Tampermonkey on chrome expects to.

Also changes the scripts_for() function to take a QUrl arg so the caller
doesn't need to worry about encodings.
---
 qutebrowser/browser/greasemonkey.py   | 5 +++--
 qutebrowser/browser/webkit/webpage.py | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index a0eb109fd..3243ed8d8 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -181,9 +181,10 @@ class GreasemonkeyManager(QObject):
         returns a tuple of lists of scripts meant to run at (document-start,
         document-end, document-idle)
         """
-        if url.split(':', 1)[0] not in self.greaseable_schemes:
+        if url.scheme() not in self.greaseable_schemes:
             return MatchingScripts(url, [], [], [])
-        match = functools.partial(fnmatch.fnmatch, url)
+        match = functools.partial(fnmatch.fnmatch,
+                                  str(url.toEncoded(), 'utf-8'))
         tester = (lambda script:
                   any([match(pat) for pat in script.includes]) and
                   not any([match(pat) for pat in script.excludes]))
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 15f662e61..e48519189 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -300,7 +300,7 @@ class BrowserPage(QWebPage):
         """
         greasemonkey = objreg.get('greasemonkey')
         url = self.currentFrame().url()
-        scripts = greasemonkey.scripts_for(url.toDisplayString())
+        scripts = greasemonkey.scripts_for(url)
 
         if load == "start":
             toload = scripts.start

From efde31aa5700f41b75ee7f119d6c3cacea9cdf90 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Sun, 8 Oct 2017 12:35:01 +1300
Subject: [PATCH 038/322] Greasemonkey: Support QTWebEngine versions < 5.8

QTWebEngine 5.8 added support for parsing greasemonkey metadata blocks
and scripts added to the QWebEngineScriptCollection of a page or its
profile and then deciding what urls to run those scripts on and at what
point in the load process to run them. For earlier versions we must do
that work ourselves. But with the additional handicap of the less rich
qtwebengine api.

We have acceptNavigationRequest, loadStarted, loadProgress,
loadFinished, urlChanged to choose from regarding points at which to
register scripts for the current page.

Adding scripts on acceptNavigation loadStarted and loadFinished causes
scripts to run too early or too late (eg on the pages being navigated
from/to) and not run on the desired page at the time they are inserted.
We could maybe do some more sophisticated stuff with loadProgress but it
didn't have any better behaviour in the brief testing I gave it.
Registering scripts on the urlChanged event seems to work fine. Even if
it seems like there could be problems with the signal firing too often,
due to not necessarily being tied to the page load progress, that
doesn't seem to have an effect in practice. The event is fired when, for
example, the url fragment changes and even if we add a new script to the
collection (or remove an existing one) it doesn't have an effect on what
is running on the page.

I suspect all of those timing issues is due to the signals being
forwarded fairly directly from the underlying chomium/blink code but the
webengine script stuff only being pushed back to the implementation on
certain events.

Anyway, using urlChanged seems to work fine due to some quirk(s) of the
implementation. That might change with later development but this
codepath is only ever going to be used for version 5.7.

There are other potential optimizations like not removing and then
re-adding scripts for the current page. But they probably wouldn't do
anything anyway, or at least anything that you would expect.
---
 qutebrowser/browser/webengine/webview.py | 45 ++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py
index 56bd1eb5a..35d6fca40 100644
--- a/qutebrowser/browser/webengine/webview.py
+++ b/qutebrowser/browser/webengine/webview.py
@@ -23,12 +23,14 @@ import functools
 
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QUrl, PYQT_VERSION
 from PyQt5.QtGui import QPalette
-from PyQt5.QtWebEngineWidgets import QWebEngineView, QWebEnginePage
+from PyQt5.QtWebEngineWidgets import (QWebEngineView, QWebEnginePage,
+                                      QWebEngineScript)
 
 from qutebrowser.browser import shared
 from qutebrowser.browser.webengine import certificateerror, webenginesettings
 from qutebrowser.config import config
-from qutebrowser.utils import log, debug, usertypes, jinja, urlutils, message
+from qutebrowser.utils import (log, debug, usertypes, jinja, urlutils, message,
+                               objreg, qtutils)
 
 
 class WebEngineView(QWebEngineView):
@@ -135,6 +137,7 @@ class WebEnginePage(QWebEnginePage):
         self._theme_color = theme_color
         self._set_bg_color()
         config.instance.changed.connect(self._set_bg_color)
+        self.urlChanged.connect(self._inject_userjs)
 
     @config.change_filter('colors.webpage.bg')
     def _set_bg_color(self):
@@ -300,3 +303,41 @@ class WebEnginePage(QWebEnginePage):
             message.error(msg)
             return False
         return True
+
+    @pyqtSlot('QUrl')
+    def _inject_userjs(self, url):
+        """Inject userscripts registered for `url` into the current page."""
+        if qtutils.version_check('5.8'):
+            # Handled in webenginetab with the builtin greasemonkey
+            # support.
+            return
+
+        # Using QWebEnginePage.scripts() to hold the user scripts means
+        # we don't have to worry ourselves about where to inject the
+        # page but also means scripts hang around for the tab lifecycle.
+        # So clear them here.
+        scripts = self.scripts()
+        for script in scripts.toList():
+            if script.name().startswith("GM-"):
+                really_removed = scripts.remove(script)
+                log.greasemonkey.debug("Removing ({}) script: {}"
+                                       .format(really_removed, script.name()))
+
+        def _add_script(script, injection_point):
+            new_script = QWebEngineScript()
+            new_script.setInjectionPoint(injection_point)
+            new_script.setWorldId(QWebEngineScript.MainWorld)
+            new_script.setSourceCode(script.code())
+            new_script.setName("GM-{}".format(script.name))
+            log.greasemonkey.debug("Adding script: {}"
+                                   .format(new_script.name()))
+            scripts.insert(new_script)
+
+        greasemonkey = objreg.get('greasemonkey')
+        matching_scripts = greasemonkey.scripts_for(url)
+        for script in matching_scripts.start:
+            _add_script(script, QWebEngineScript.DocumentCreation)
+        for script in matching_scripts.end:
+            _add_script(script, QWebEngineScript.DocumentReady)
+        for script in matching_scripts.idle:
+            _add_script(script, QWebEngineScript.Deferred)

From fb019b2dab342a98ae8e364e893650fecd42fd62 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Tue, 10 Oct 2017 20:45:10 +1300
Subject: [PATCH 039/322] Address second round line comments.

Add qute version to GM_info object in GM wrapper.
Support using the greasemonkey @namespace metadata for its intended
purpose of avoiding name collisions.
Get a nice utf8 encoded string from a QUrl more better.
---
 qutebrowser/browser/greasemonkey.py           |  9 +++++---
 .../javascript/greasemonkey_wrapper.js        | 22 +++++++++++--------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 3243ed8d8..b58a558a5 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -27,7 +27,7 @@ import functools
 import glob
 
 import attr
-from PyQt5.QtCore import pyqtSignal, QObject
+from PyQt5.QtCore import pyqtSignal, QObject, QUrl
 
 from qutebrowser.utils import log, standarddir, jinja
 from qutebrowser.commands import cmdutils
@@ -47,10 +47,13 @@ class GreasemonkeyScript:
         self.excludes = []
         self.description = None
         self.name = None
+        self.namespace = None
         self.run_at = None
         for name, value in properties:
             if name == 'name':
                 self.name = value
+            elif name == 'namespace':
+                self.namespace = value
             elif name == 'description':
                 self.description = value
             elif name in ['include', 'match']:
@@ -93,7 +96,7 @@ class GreasemonkeyScript:
         """
         return jinja.js_environment.get_template(
             'greasemonkey_wrapper.js').render(
-                scriptName=self.name,
+                scriptName="/".join([self.namespace or '', self.name]),
                 scriptInfo=self._meta_json(),
                 scriptMeta=self.script_meta,
                 scriptSource=self._code)
@@ -184,7 +187,7 @@ class GreasemonkeyManager(QObject):
         if url.scheme() not in self.greaseable_schemes:
             return MatchingScripts(url, [], [], [])
         match = functools.partial(fnmatch.fnmatch,
-                                  str(url.toEncoded(), 'utf-8'))
+                                  url.toString(QUrl.FullyEncoded))
         tester = (lambda script:
                   any([match(pat) for pat in script.includes]) and
                   not any([match(pat) for pat in script.excludes]))
diff --git a/qutebrowser/javascript/greasemonkey_wrapper.js b/qutebrowser/javascript/greasemonkey_wrapper.js
index 605f82d5a..eb2d8fea1 100644
--- a/qutebrowser/javascript/greasemonkey_wrapper.js
+++ b/qutebrowser/javascript/greasemonkey_wrapper.js
@@ -5,15 +5,19 @@
         console.log(text);
     }
 
-    var GM_info = (function () {
-        return {
-            'script': {{ scriptInfo | tojson }},
-            'scriptMetaStr': {{ scriptMeta | tojson }},
-            'scriptWillUpdate': false,
-            'version': '0.0.1',
-            'scriptHandler': 'Tampermonkey' // so scripts don't expect exportFunction
-        };
-    }());
+    var GM_info = {
+        'script': {{ scriptInfo }},
+        'scriptMetaStr': {{ scriptMeta | tojson }},
+        'scriptWillUpdate': false,
+        'version': "0.0.1",
+        'scriptHandler': 'Tampermonkey' // so scripts don't expect exportFunction
+    };
+
+    function checkKey(key, funcName) {
+        if (typeof key !== "string") {
+          throw new Error(funcName+" requires the first parameter to be of type string, not '"+typeof key+"'");
+        }
+    }
 
     function GM_setValue(key, value) {
         if (typeof key !== "string") {

From c0832eb04b87b6762f4d84440039bc6cf8dc472b Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Tue, 10 Oct 2017 20:52:41 +1300
Subject: [PATCH 040/322] Greasemonkey: support @nosubframes.

And run on frames by default. At least on webengine. There is probably
some api to enumerate frames on a webkit page.

Not tested.
---
 qutebrowser/browser/greasemonkey.py                | 5 +++++
 qutebrowser/browser/webengine/webenginesettings.py | 4 +++-
 qutebrowser/browser/webengine/webview.py           | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index b58a558a5..cd6fce27a 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -49,6 +49,9 @@ class GreasemonkeyScript:
         self.name = None
         self.namespace = None
         self.run_at = None
+        self.script_meta = None
+        # Running on subframes is only supported on the qtwebengine backend.
+        self.runs_on_sub_frames = True
         for name, value in properties:
             if name == 'name':
                 self.name = value
@@ -62,6 +65,8 @@ class GreasemonkeyScript:
                 self.excludes.append(value)
             elif name == 'run-at':
                 self.run_at = value
+            elif name == 'noframes':
+                self.runs_on_sub_frames = False
 
     HEADER_REGEX = r'// ==UserScript==|\n+// ==/UserScript==\n'
     PROPS_REGEX = r'// @(?P<prop>[^\s]+)\s+(?P<val>.+)'
diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index 18ba98fd6..dade671c8 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -276,7 +276,9 @@ def inject_userscripts():
             new_script.setWorldId(QWebEngineScript.MainWorld)
             new_script.setSourceCode(script.code())
             new_script.setName("GM-{}".format(script.name))
-            log.greasemonkey.debug('adding script: %s', new_script.name())
+            new_script.setRunsOnSubFrames(script.runs_on_sub_frames)
+            log.greasemonkey.debug('adding script: {}'
+                                   .format(new_script.name()))
             scripts.insert(new_script)
 
 
diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py
index 35d6fca40..af4476d4a 100644
--- a/qutebrowser/browser/webengine/webview.py
+++ b/qutebrowser/browser/webengine/webview.py
@@ -329,6 +329,7 @@ class WebEnginePage(QWebEnginePage):
             new_script.setWorldId(QWebEngineScript.MainWorld)
             new_script.setSourceCode(script.code())
             new_script.setName("GM-{}".format(script.name))
+            new_script.setRunsOnSubFrames(script.runs_on_sub_frames)
             log.greasemonkey.debug("Adding script: {}"
                                    .format(new_script.name()))
             scripts.insert(new_script)

From 7c497427ce7cdaf3d23362cdae570b9660d7cf45 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Tue, 10 Oct 2017 20:54:58 +1300
Subject: [PATCH 041/322] Greasemonkey: various javascript fixups to GM wrapper
 template.

Thanks to @sandrosc. A few breaking changes fixed (default method to
GM_xhr not working, GM_listvalues not cleaning up output, GM_setvalue
param checking logic wrong) and a few hygenic changes made.
---
 .../javascript/greasemonkey_wrapper.js        | 36 ++++++++-----------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/qutebrowser/javascript/greasemonkey_wrapper.js b/qutebrowser/javascript/greasemonkey_wrapper.js
index eb2d8fea1..7a271375d 100644
--- a/qutebrowser/javascript/greasemonkey_wrapper.js
+++ b/qutebrowser/javascript/greasemonkey_wrapper.js
@@ -20,11 +20,9 @@
     }
 
     function GM_setValue(key, value) {
-        if (typeof key !== "string") {
-          throw new Error("GM_setValue requires the first parameter to be of type string, not '"+typeof key+"'");
-        }
-        if (typeof value !== "string" ||
-            typeof value !== "number" ||
+        checkKey(key, "GM_setValue");
+        if (typeof value !== "string" &&
+            typeof value !== "number" &&
             typeof value !== "boolean") {
           throw new Error("GM_setValue requires the second parameter to be of type string, number or boolean, not '"+typeof value+"'");
         }
@@ -32,24 +30,20 @@
     }
 
     function GM_getValue(key, default_) {
-        if (typeof key !== "string") {
-          throw new Error("GM_getValue requires the first parameter to be of type string, not '"+typeof key+"'");
-        }
+        checkKey(key, "GM_getValue");
         return localStorage.getItem(_qute_script_id + key) || default_;
     }
 
     function GM_deleteValue(key) {
-        if (typeof key !== "string") {
-          throw new Error("GM_deleteValue requires the first parameter to be of type string, not '"+typeof key+"'");
-        }
+        checkKey(key, "GM_deleteValue");
         localStorage.removeItem(_qute_script_id + key);
     }
 
     function GM_listValues() {
-        var i, keys = [];
-        for (i = 0; i < localStorage.length; i = i + 1) {
+        var keys = [];
+        for (var i = 0; i < localStorage.length; i++) {
             if (localStorage.key(i).startsWith(_qute_script_id)) {
-                keys.push(localStorage.key(i));
+                keys.push(localStorage.key(i).slice(_qute_script_id.length));
             }
         }
         return keys;
@@ -62,7 +56,7 @@
 
     // Almost verbatim copy from Eric
     function GM_xmlhttpRequest(/* object */ details) {
-        details.method = details.method.toUpperCase() || "GET";
+        details.method = details.method ? details.method.toUpperCase() : "GET";
 
         if (!details.url) {
             throw ("GM_xmlhttpRequest requires an URL.");
@@ -99,26 +93,24 @@
     }
 
     function GM_addStyle(/* String */ styles) {
+        var oStyle = document.createElement("style");
+        oStyle.setAttribute("type", "text/css");
+        oStyle.appendChild(document.createTextNode(styles));
+
         var head = document.getElementsByTagName("head")[0];
         if (head === undefined) {
             document.onreadystatechange = function () {
                 if (document.readyState == "interactive") {
-                    var oStyle = document.createElement("style");
-                    oStyle.setAttribute("type", "text/css");
-                    oStyle.appendChild(document.createTextNode(styles));
                     document.getElementsByTagName("head")[0].appendChild(oStyle);
                 }
             }
         }
         else {
-            var oStyle = document.createElement("style");
-            oStyle.setAttribute("type", "text/css");
-            oStyle.appendChild(document.createTextNode(styles));
             head.appendChild(oStyle);
         }
     }
 
-    unsafeWindow = window;
+    var unsafeWindow = window;
 
     //====== The actual user script source ======//
 {{ scriptSource }}

From 4c3461038dc4fe2a0732860f064f13a3d1c9f298 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Tue, 10 Oct 2017 20:59:27 +1300
Subject: [PATCH 042/322] Greasemonkey: add minimal end-to-end test.

Just runs a greasemonkey script on a test page and uses console.log to
ensure it is running.

Tests @include, and basic happy path greasemonkey.py operation (loading
and parsing script, scrip_for on webkit), only testing document-start
injecting point but that is the troublsome one at this point.

Tested on py35 debian unstable (oldwebkit and qtwebengine5.9) debian
stable qtwebengine5.7.

Note the extra :reload call for qt5.7 because document-start scripts
don't seem to run on the first page load with the current insertion
point. I need to look into this more to look at ways of fixing this.
---
 tests/end2end/features/javascript.feature     |  9 ++++++++
 tests/end2end/features/test_javascript_bdd.py | 22 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/tests/end2end/features/javascript.feature b/tests/end2end/features/javascript.feature
index a309d6187..66d108125 100644
--- a/tests/end2end/features/javascript.feature
+++ b/tests/end2end/features/javascript.feature
@@ -123,3 +123,12 @@ Feature: Javascript stuff
         And I wait for "[*/data/javascript/windowsize.html:*] loaded" in the log
         And I run :tab-next
         Then the window sizes should be the same
+
+    Scenario: Have a greasemonkey script run on a page
+        When I have a greasemonkey file saved
+        And I run :greasemonkey-reload
+        And I open data/title.html
+        # This second reload is required in webengine < 5.8 for scripts
+        # registered to run at document-start, some sort of timing issue.
+        And I run :reload
+        Then the javascript message "Script is running." should be logged
diff --git a/tests/end2end/features/test_javascript_bdd.py b/tests/end2end/features/test_javascript_bdd.py
index 9f6c021ce..cb81e1ef6 100644
--- a/tests/end2end/features/test_javascript_bdd.py
+++ b/tests/end2end/features/test_javascript_bdd.py
@@ -17,6 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
+import os.path
+
 import pytest_bdd as bdd
 bdd.scenarios('javascript.feature')
 
@@ -29,3 +31,23 @@ def check_window_sizes(quteproc):
     hidden_size = hidden.message.split()[-1]
     visible_size = visible.message.split()[-1]
     assert hidden_size == visible_size
+
+test_gm_script="""
+// ==UserScript==
+// @name Qutebrowser test userscript
+// @namespace invalid.org
+// @include http://localhost:*/data/title.html
+// @exclude ???
+// @run-at document-start
+// ==/UserScript==
+console.log("Script is running on " + window.location.pathname);
+"""
+
+@bdd.when("I have a greasemonkey file saved")
+def create_greasemonkey_file(quteproc):
+    script_path = os.path.join(quteproc.basedir, 'data', 'greasemonkey')
+    os.mkdir(script_path)
+    file_path = os.path.join(script_path, 'test.user.js')
+    with open(file_path, 'w', encoding='utf-8') as f:
+        f.write(test_gm_script)
+

From 9aeb5775c1856a612d72e4bb2e791d3a0c50775c Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Tue, 24 Oct 2017 21:19:22 +1300
Subject: [PATCH 043/322] greasemonkey: run scripts on subframes on webkit

Use the `QWebPage.frameCreated` signal to get notifications of subframes
and connect the javascript injection triggering signals on those frames
too.

I had to add a `url = url() or requestedUrl()` bit in there because the
inject_userjs method was getting called to early or something when
frame.url() wasn't set or was set to the previous page so we were
passing the wrong url to greasemonkey.scripts_for().

I ran into a bizarre (I maybe it is completely obvious and I just don't
see it) issue where the signals attached to the main frame that were
connected to a partial function with the main frame as an argument were
not getting emitted, or at least those partial functions were not being
called. I worked around it by using None to mean defaulting to the main
frame in a couple of places.
---
 qutebrowser/browser/greasemonkey.py   |  1 -
 qutebrowser/browser/webkit/webpage.py | 63 +++++++++++++++++++++------
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index cd6fce27a..c8ada7b9a 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -50,7 +50,6 @@ class GreasemonkeyScript:
         self.namespace = None
         self.run_at = None
         self.script_meta = None
-        # Running on subframes is only supported on the qtwebengine backend.
         self.runs_on_sub_frames = True
         for name, value in properties:
             if name == 'name':
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index e48519189..299815cc3 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -86,12 +86,33 @@ class BrowserPage(QWebPage):
             self.on_save_frame_state_requested)
         self.restoreFrameStateRequested.connect(
             self.on_restore_frame_state_requested)
-        self.mainFrame().javaScriptWindowObjectCleared.connect(
-            functools.partial(self.inject_userjs, load='start'))
-        self.mainFrame().initialLayoutCompleted.connect(
-            functools.partial(self.inject_userjs, load='end'))
-        self.mainFrame().loadFinished.connect(
-            functools.partial(self.inject_userjs, load='idle'))
+        self.connect_userjs_signals(None)
+        self.frameCreated.connect(self.connect_userjs_signals)
+
+    @pyqtSlot('QWebFrame*')
+    def connect_userjs_signals(self, frame_arg):
+        """
+        Connect the signals used as triggers for injecting user
+        javascripts into `frame_arg`.
+        """
+        # If we pass whatever self.mainFrame() or self.currentFrame() returns
+        # at init time into the partial functions which the signals
+        # below call then the signals don't seem to be called at all for
+        # the main frame of the first tab. I have no idea why I am
+        # seeing this behavior. Replace the None in the call to this
+        # function in __init__ with self.mainFrame() and try for
+        # yourself.
+        if frame_arg:
+            frame = frame_arg
+        else:
+            frame = self.mainFrame()
+
+        frame.javaScriptWindowObjectCleared.connect(
+            functools.partial(self.inject_userjs, frame_arg, load='start'))
+        frame.initialLayoutCompleted.connect(
+            functools.partial(self.inject_userjs, frame_arg, load='end'))
+        frame.loadFinished.connect(
+            functools.partial(self.inject_userjs, frame_arg, load='idle'))
 
     def javaScriptPrompt(self, frame, js_msg, default):
         """Override javaScriptPrompt to use qutebrowser prompts."""
@@ -290,16 +311,24 @@ class BrowserPage(QWebPage):
             self.error_occurred = False
 
     @pyqtSlot()
-    def inject_userjs(self, load):
+    def inject_userjs(self, frame, load):
         """Inject user javascripts into the page.
 
-        param: The page load stage to inject the corresponding scripts
-               for. Support values are "start", "end" and "idle",
-               corresponding to the allowed values of the `@run-at`
-               directive in the greasemonkey metadata spec.
+        Args:
+            frame: The QWebFrame to inject the user scripts into, or
+                   None for the main frame.
+            load: The page load stage to inject the corresponding
+                  scripts for. Support values are "start", "end" and
+                  "idle", corresponding to the allowed values of the
+                  `@run-at` directive in the greasemonkey metadata spec.
         """
+        if not frame:
+            frame = self.mainFrame()
+        url = frame.url()
+        if url.isEmpty():
+            url = frame.requestedUrl()
+
         greasemonkey = objreg.get('greasemonkey')
-        url = self.currentFrame().url()
         scripts = greasemonkey.scripts_for(url)
 
         if load == "start":
@@ -309,9 +338,15 @@ class BrowserPage(QWebPage):
         elif load == "idle":
             toload = scripts.idle
 
+        if url.isEmpty():
+            # This happens during normal usage like with view source but may
+            # also indicate a bug.
+            log.greasemonkey.debug("Not running scripts for frame with no "
+                                   "url: {}".format(frame))
         for script in toload:
-            log.webview.debug('Running GM script: {}'.format(script.name))
-            self.currentFrame().evaluateJavaScript(script.code())
+            if frame is self.mainFrame() or script.runs_on_sub_frames:
+                log.webview.debug('Running GM script: {}'.format(script.name))
+                frame.evaluateJavaScript(script.code())
 
     @pyqtSlot('QWebFrame*', 'QWebPage::Feature')
     def _on_feature_permission_requested(self, frame, feature):

From 361a1ed6e46bf602825986e97c540b17c44b12a7 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 1 Nov 2017 23:37:53 +1300
Subject: [PATCH 044/322] Greasemonkey: change PROPS_REGEX to handle non-value
 keys.

We weren't actually picking up the @noframes greasemonkey directive
because of this. I haven't tested this very extensively but it seems to
work for making the property value optional.
---
 qutebrowser/browser/greasemonkey.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index c8ada7b9a..845b83d85 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -68,7 +68,7 @@ class GreasemonkeyScript:
                 self.runs_on_sub_frames = False
 
     HEADER_REGEX = r'// ==UserScript==|\n+// ==/UserScript==\n'
-    PROPS_REGEX = r'// @(?P<prop>[^\s]+)\s+(?P<val>.+)'
+    PROPS_REGEX = r'// @(?P<prop>[^\s]+)\s*(?P<val>.*)'
 
     @classmethod
     def parse(cls, source):

From dd59f8d724ccd3c3e86b201511ceb07da483a53e Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 1 Nov 2017 23:41:52 +1300
Subject: [PATCH 045/322] Greasemonkey: add more end2end tests

Test document-end and noframes. Because coverage.py told me to.
Hopefully this doesn't slow the test run down too much, particularly the
"should not be logged" bit.

I'm just reusing and existing test html page that used an iframe because
I'm lazy.
---
 tests/end2end/features/javascript.feature     | 20 ++++++++---
 tests/end2end/features/test_javascript_bdd.py | 35 +++++++++++++------
 2 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/tests/end2end/features/javascript.feature b/tests/end2end/features/javascript.feature
index 66d108125..aaad84be3 100644
--- a/tests/end2end/features/javascript.feature
+++ b/tests/end2end/features/javascript.feature
@@ -124,11 +124,23 @@ Feature: Javascript stuff
         And I run :tab-next
         Then the window sizes should be the same
 
-    Scenario: Have a greasemonkey script run on a page
-        When I have a greasemonkey file saved
+    Scenario: Have a greasemonkey script run at page start
+        When I have a greasemonkey file saved for document-start with noframes unset
         And I run :greasemonkey-reload
-        And I open data/title.html
+        And I open data/hints/iframe.html
         # This second reload is required in webengine < 5.8 for scripts
         # registered to run at document-start, some sort of timing issue.
         And I run :reload
-        Then the javascript message "Script is running." should be logged
+        Then the javascript message "Script is running on /data/hints/iframe.html" should be logged
+
+    Scenario: Have a greasemonkey script running on frames
+        When I have a greasemonkey file saved for document-end with noframes unset
+        And I run :greasemonkey-reload
+        And I open data/hints/iframe.html
+        Then the javascript message "Script is running on /data/hints/html/wrapped.html" should be logged
+
+    Scenario: Have a greasemonkey script running on noframes
+        When I have a greasemonkey file saved for document-end with noframes set
+        And I run :greasemonkey-reload
+        And I open data/hints/iframe.html
+        Then the javascript message "Script is running on /data/hints/html/wrapped.html" should not be logged
diff --git a/tests/end2end/features/test_javascript_bdd.py b/tests/end2end/features/test_javascript_bdd.py
index cb81e1ef6..16896d4b5 100644
--- a/tests/end2end/features/test_javascript_bdd.py
+++ b/tests/end2end/features/test_javascript_bdd.py
@@ -32,22 +32,37 @@ def check_window_sizes(quteproc):
     visible_size = visible.message.split()[-1]
     assert hidden_size == visible_size
 
-test_gm_script="""
+
+test_gm_script = r"""
 // ==UserScript==
 // @name Qutebrowser test userscript
 // @namespace invalid.org
-// @include http://localhost:*/data/title.html
+// @include http://localhost:*/data/hints/iframe.html
+// @include http://localhost:*/data/hints/html/wrapped.html
 // @exclude ???
-// @run-at document-start
+// @run-at {stage}
+// {frames}
 // ==/UserScript==
 console.log("Script is running on " + window.location.pathname);
 """
 
-@bdd.when("I have a greasemonkey file saved")
-def create_greasemonkey_file(quteproc):
-    script_path = os.path.join(quteproc.basedir, 'data', 'greasemonkey')
-    os.mkdir(script_path)
-    file_path = os.path.join(script_path, 'test.user.js')
-    with open(file_path, 'w', encoding='utf-8') as f:
-        f.write(test_gm_script)
 
+@bdd.when(bdd.parsers.parse("I have a greasemonkey file saved for {stage} "
+                            "with noframes {frameset}"))
+def create_greasemonkey_file(quteproc, stage, frameset):
+    script_path = os.path.join(quteproc.basedir, 'data', 'greasemonkey')
+    try:
+        os.mkdir(script_path)
+    except FileExistsError:
+        pass
+    file_path = os.path.join(script_path, 'test.user.js')
+    if frameset == "set":
+        frames = "@noframes"
+    elif frameset == "unset":
+        frames = ""
+    else:
+        raise ValueError("noframes can only be set or unset, "
+                         "not {}".format(frameset))
+    with open(file_path, 'w', encoding='utf-8') as f:
+        f.write(test_gm_script.format(stage=stage,
+                                     frames=frames))

From 92b48e77c79cf5b1206fdd953a92678315f083e6 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 1 Nov 2017 23:45:31 +1300
Subject: [PATCH 046/322] Greasemonkey: add unit tests for GreasemonkeyManager

---
 tests/unit/javascript/test_greasemonkey.py | 108 +++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 tests/unit/javascript/test_greasemonkey.py

diff --git a/tests/unit/javascript/test_greasemonkey.py b/tests/unit/javascript/test_greasemonkey.py
new file mode 100644
index 000000000..b0ba64bdf
--- /dev/null
+++ b/tests/unit/javascript/test_greasemonkey.py
@@ -0,0 +1,108 @@
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for qutebrowser.browser.greasemonkey."""
+
+import os
+import logging
+
+import pytest
+from PyQt5.QtCore import QUrl
+
+from qutebrowser.browser import greasemonkey
+
+test_gm_script = """
+// ==UserScript==
+// @name Qutebrowser test userscript
+// @namespace invalid.org
+// @include http://localhost:*/data/title.html
+// @match http://trolol*
+// @exclude https://badhost.xxx/*
+// @run-at document-start
+// ==/UserScript==
+console.log("Script is running.");
+"""
+
+pytestmark = pytest.mark.usefixtures('data_tmpdir')
+
+
+def save_script(script_text, filename):
+    script_path = greasemonkey._scripts_dir()
+    try:
+        os.mkdir(script_path)
+    except FileExistsError:
+        pass
+    file_path = os.path.join(script_path, filename)
+    with open(file_path, 'w', encoding='utf-8') as f:
+        f.write(script_text)
+
+
+def test_all():
+    """Test that a script gets read from file, parsed and returned."""
+    save_script(test_gm_script, 'test.user.js')
+
+    gm_manager = greasemonkey.GreasemonkeyManager()
+    assert (gm_manager.all_scripts()[0].name ==
+            "Qutebrowser test userscript")
+
+
+@pytest.mark.parametrize("url, expected_matches", [
+    # included
+    ('http://trololololololo.com/', 1),
+    # neither included nor excluded
+    ('http://aaaaaaaaaa.com/', 0),
+    # excluded
+    ('https://badhost.xxx/', 0),
+])
+def test_get_scripts_by_url(url, expected_matches):
+    """Check greasemonkey include/exclude rules work."""
+    save_script(test_gm_script, 'test.user.js')
+    gm_manager = greasemonkey.GreasemonkeyManager()
+
+    scripts = gm_manager.scripts_for(QUrl(url))
+    assert (len(scripts.start + scripts.end + scripts.idle) ==
+            expected_matches)
+
+
+def test_no_metadata(caplog):
+    """Run on all sites at document-end is the default."""
+    save_script("var nothing = true;\n", 'nothing.user.js')
+
+    with caplog.at_level(logging.WARNING):
+        gm_manager = greasemonkey.GreasemonkeyManager()
+
+    scripts = gm_manager.scripts_for(QUrl('http://notamatch.invalid/'))
+    assert len(scripts.start + scripts.end + scripts.idle) == 1
+    assert len(scripts.end) == 1
+
+
+def test_bad_scheme(caplog):
+    """qute:// isn't in the list of allowed schemes."""
+    save_script("var nothing = true;\n", 'nothing.user.js')
+
+    with caplog.at_level(logging.WARNING):
+        gm_manager = greasemonkey.GreasemonkeyManager()
+
+    scripts = gm_manager.scripts_for(QUrl('qute://settings'))
+    assert len(scripts.start + scripts.end + scripts.idle) == 0
+
+
+def test_load_emits_signal(qtbot):
+    gm_manager = greasemonkey.GreasemonkeyManager()
+    with qtbot.wait_signal(gm_manager.scripts_reloaded):
+        gm_manager.load_scripts()

From 8a5b42ffbd6ad878fa5810819086b1db77fe8842 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Sat, 4 Nov 2017 16:11:58 +1300
Subject: [PATCH 047/322] Greasemonkey: es6ify the greasemonkey wrapper js.

Because backwards compatibility sucks I guess.
---
 .../javascript/greasemonkey_wrapper.js        | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/qutebrowser/javascript/greasemonkey_wrapper.js b/qutebrowser/javascript/greasemonkey_wrapper.js
index 7a271375d..e86991040 100644
--- a/qutebrowser/javascript/greasemonkey_wrapper.js
+++ b/qutebrowser/javascript/greasemonkey_wrapper.js
@@ -1,11 +1,11 @@
 (function () {
-    var _qute_script_id = "__gm_"+{{ scriptName | tojson }};
+    const _qute_script_id = "__gm_"+{{ scriptName | tojson }};
 
     function GM_log(text) {
         console.log(text);
     }
 
-    var GM_info = {
+    const GM_info = {
         'script': {{ scriptInfo }},
         'scriptMetaStr': {{ scriptMeta | tojson }},
         'scriptWillUpdate': false,
@@ -15,7 +15,7 @@
 
     function checkKey(key, funcName) {
         if (typeof key !== "string") {
-          throw new Error(funcName+" requires the first parameter to be of type string, not '"+typeof key+"'");
+          throw new Error(`${funcName} requires the first parameter to be of type string, not '${typeof key}'`);
         }
     }
 
@@ -24,7 +24,7 @@
         if (typeof value !== "string" &&
             typeof value !== "number" &&
             typeof value !== "boolean") {
-          throw new Error("GM_setValue requires the second parameter to be of type string, number or boolean, not '"+typeof value+"'");
+          throw new Error(`GM_setValue requires the second parameter to be of type string, number or boolean, not '${typeof value}'`);
         }
         localStorage.setItem(_qute_script_id + key, value);
     }
@@ -40,8 +40,8 @@
     }
 
     function GM_listValues() {
-        var keys = [];
-        for (var i = 0; i < localStorage.length; i++) {
+        let keys = [];
+        for (let i = 0; i < localStorage.length; i++) {
             if (localStorage.key(i).startsWith(_qute_script_id)) {
                 keys.push(localStorage.key(i).slice(_qute_script_id.length));
             }
@@ -63,7 +63,7 @@
         }
 
         // build XMLHttpRequest object
-        var oXhr = new XMLHttpRequest();
+        let oXhr = new XMLHttpRequest();
         // run it
         if ("onreadystatechange" in details) {
             oXhr.onreadystatechange = function () {
@@ -80,7 +80,7 @@
         oXhr.open(details.method, details.url, true);
 
         if ("headers" in details) {
-            for (var header in details.headers) {
+            for (let header in details.headers) {
                 oXhr.setRequestHeader(header, details.headers[header]);
             }
         }
@@ -93,11 +93,11 @@
     }
 
     function GM_addStyle(/* String */ styles) {
-        var oStyle = document.createElement("style");
+        let oStyle = document.createElement("style");
         oStyle.setAttribute("type", "text/css");
         oStyle.appendChild(document.createTextNode(styles));
 
-        var head = document.getElementsByTagName("head")[0];
+        let head = document.getElementsByTagName("head")[0];
         if (head === undefined) {
             document.onreadystatechange = function () {
                 if (document.readyState == "interactive") {
@@ -110,7 +110,7 @@
         }
     }
 
-    var unsafeWindow = window;
+    const unsafeWindow = window;
 
     //====== The actual user script source ======//
 {{ scriptSource }}

From df624944f99a0dca33900ddaed2cd49f73880ac6 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 8 Nov 2017 21:03:58 +1300
Subject: [PATCH 048/322] Greasemonkey: webkit: injected all scripts on
 loadFinished.

The signal we were using to inject greasemonkey scripts registered to
run at document-start (javaScriptWindowObjectCleared) was unreliable to
non-existant. The initialLayoutCompleted signal is a bit of an odd duck
too I suppose. Anyway, we don't anticipate any scripts would break from
being injected when the page is finished loaded that wouldn't already
have been flaky due to the complexities of the modern web. If there is
an issue hopefully someone raises an issue and we can look into it.
---
 qutebrowser/browser/webkit/webpage.py | 51 +++++++--------------------
 1 file changed, 13 insertions(+), 38 deletions(-)

diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 299815cc3..f9bd51194 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -86,33 +86,18 @@ class BrowserPage(QWebPage):
             self.on_save_frame_state_requested)
         self.restoreFrameStateRequested.connect(
             self.on_restore_frame_state_requested)
-        self.connect_userjs_signals(None)
+        self.connect_userjs_signals(self.mainFrame())
         self.frameCreated.connect(self.connect_userjs_signals)
 
     @pyqtSlot('QWebFrame*')
-    def connect_userjs_signals(self, frame_arg):
-        """
-        Connect the signals used as triggers for injecting user
-        javascripts into `frame_arg`.
-        """
-        # If we pass whatever self.mainFrame() or self.currentFrame() returns
-        # at init time into the partial functions which the signals
-        # below call then the signals don't seem to be called at all for
-        # the main frame of the first tab. I have no idea why I am
-        # seeing this behavior. Replace the None in the call to this
-        # function in __init__ with self.mainFrame() and try for
-        # yourself.
-        if frame_arg:
-            frame = frame_arg
-        else:
-            frame = self.mainFrame()
+    def connect_userjs_signals(self, frame):
+        """Connect userjs related signals to `frame`.
 
-        frame.javaScriptWindowObjectCleared.connect(
-            functools.partial(self.inject_userjs, frame_arg, load='start'))
-        frame.initialLayoutCompleted.connect(
-            functools.partial(self.inject_userjs, frame_arg, load='end'))
+        Connect the signals used as triggers for injecting user
+        javascripts into the passed QWebFrame.
+        """
         frame.loadFinished.connect(
-            functools.partial(self.inject_userjs, frame_arg, load='idle'))
+            functools.partial(self.inject_userjs, frame))
 
     def javaScriptPrompt(self, frame, js_msg, default):
         """Override javaScriptPrompt to use qutebrowser prompts."""
@@ -311,32 +296,22 @@ class BrowserPage(QWebPage):
             self.error_occurred = False
 
     @pyqtSlot()
-    def inject_userjs(self, frame, load):
+    def inject_userjs(self, frame):
         """Inject user javascripts into the page.
 
         Args:
-            frame: The QWebFrame to inject the user scripts into, or
-                   None for the main frame.
-            load: The page load stage to inject the corresponding
-                  scripts for. Support values are "start", "end" and
-                  "idle", corresponding to the allowed values of the
-                  `@run-at` directive in the greasemonkey metadata spec.
+            frame: The QWebFrame to inject the user scripts into.
         """
-        if not frame:
-            frame = self.mainFrame()
         url = frame.url()
         if url.isEmpty():
             url = frame.requestedUrl()
 
         greasemonkey = objreg.get('greasemonkey')
         scripts = greasemonkey.scripts_for(url)
-
-        if load == "start":
-            toload = scripts.start
-        elif load == "end":
-            toload = scripts.end
-        elif load == "idle":
-            toload = scripts.idle
+        # QtWebKit has trouble providing us with signals representing
+        # page load progress at reasonable times, so we just load all
+        # scripts on the same event.
+        toload = scripts.start + scripts.end + scripts.idle
 
         if url.isEmpty():
             # This happens during normal usage like with view source but may

From 6933bc05b4ba93ef6d8d72ec582362a7db36aef5 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 20 Nov 2017 07:31:01 +0100
Subject: [PATCH 049/322] Add some debug logging for GreaseMonkey with QtWebKit

---
 qutebrowser/browser/webkit/webpage.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index f9bd51194..7c67ab64b 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -96,6 +96,8 @@ class BrowserPage(QWebPage):
         Connect the signals used as triggers for injecting user
         javascripts into the passed QWebFrame.
         """
+        log.greasemonkey.debug("Connecting to frame {} ({})"
+                               .format(frame, frame.url().toDisplayString()))
         frame.loadFinished.connect(
             functools.partial(self.inject_userjs, frame))
 
@@ -306,6 +308,9 @@ class BrowserPage(QWebPage):
         if url.isEmpty():
             url = frame.requestedUrl()
 
+        log.greasemonkey.debug("inject_userjs called for {} ({})"
+                               .format(frame, url.toDisplayString()))
+
         greasemonkey = objreg.get('greasemonkey')
         scripts = greasemonkey.scripts_for(url)
         # QtWebKit has trouble providing us with signals representing

From db353c40300ef8d4066026b5650c27daa2da61e3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 20 Nov 2017 07:31:13 +0100
Subject: [PATCH 050/322] Connect the page signal for GreaseMonkey

Looks like we don't get the mainFrame's loadFinished signal properly.
---
 qutebrowser/browser/webkit/webpage.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 7c67ab64b..24a213a42 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -86,7 +86,8 @@ class BrowserPage(QWebPage):
             self.on_save_frame_state_requested)
         self.restoreFrameStateRequested.connect(
             self.on_restore_frame_state_requested)
-        self.connect_userjs_signals(self.mainFrame())
+        self.loadFinished.connect(
+            functools.partial(self.inject_userjs, self.mainFrame()))
         self.frameCreated.connect(self.connect_userjs_signals)
 
     @pyqtSlot('QWebFrame*')

From 0e80be2d30ac90b82db968d077d498ad9c1e8f97 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 20 Nov 2017 08:31:10 +0100
Subject: [PATCH 051/322] Clear end2end test data again after initializing

If we don't do this, earlier tests can affect later ones when e.g. using "...
should not be logged", as we don't really wait until a test has been fully
finished.
---
 tests/end2end/fixtures/quteprocess.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index 27c347ca4..3164f5fde 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -527,6 +527,7 @@ class QuteProc(testprocess.Process):
         super().before_test()
         self.send_cmd(':config-clear')
         self._init_settings()
+        self.clear_data()
 
     def _init_settings(self):
         """Adjust some qutebrowser settings after starting."""

From 0381d74e9aac2d045567db13ffc2ccca55d57160 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Mon, 27 Nov 2017 20:06:29 +1300
Subject: [PATCH 052/322] Greasemonkey: privatise some utility functions

---
 qutebrowser/browser/webkit/webpage.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 24a213a42..89b293869 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -87,11 +87,11 @@ class BrowserPage(QWebPage):
         self.restoreFrameStateRequested.connect(
             self.on_restore_frame_state_requested)
         self.loadFinished.connect(
-            functools.partial(self.inject_userjs, self.mainFrame()))
-        self.frameCreated.connect(self.connect_userjs_signals)
+            functools.partial(self._inject_userjs, self.mainFrame()))
+        self.frameCreated.connect(self._connect_userjs_signals)
 
     @pyqtSlot('QWebFrame*')
-    def connect_userjs_signals(self, frame):
+    def _connect_userjs_signals(self, frame):
         """Connect userjs related signals to `frame`.
 
         Connect the signals used as triggers for injecting user
@@ -100,7 +100,7 @@ class BrowserPage(QWebPage):
         log.greasemonkey.debug("Connecting to frame {} ({})"
                                .format(frame, frame.url().toDisplayString()))
         frame.loadFinished.connect(
-            functools.partial(self.inject_userjs, frame))
+            functools.partial(self._inject_userjs, frame))
 
     def javaScriptPrompt(self, frame, js_msg, default):
         """Override javaScriptPrompt to use qutebrowser prompts."""
@@ -298,8 +298,7 @@ class BrowserPage(QWebPage):
         else:
             self.error_occurred = False
 
-    @pyqtSlot()
-    def inject_userjs(self, frame):
+    def _inject_userjs(self, frame):
         """Inject user javascripts into the page.
 
         Args:
@@ -309,7 +308,7 @@ class BrowserPage(QWebPage):
         if url.isEmpty():
             url = frame.requestedUrl()
 
-        log.greasemonkey.debug("inject_userjs called for {} ({})"
+        log.greasemonkey.debug("_inject_userjs called for {} ({})"
                                .format(frame, url.toDisplayString()))
 
         greasemonkey = objreg.get('greasemonkey')

From d29cf1ee4d0cf68b417d77de617ae7fbe24e3814 Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Thu, 30 Nov 2017 00:09:28 +0100
Subject: [PATCH 053/322] lazy sessions, restore if visible, forward user after
 restore

---
 qutebrowser/html/back.html | 53 ++++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index 83f5cb74e..94d16824e 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -1,16 +1,53 @@
 {% extends "base.html" %}
 
 {% block script %}
-setTimeout(function() {
-	/* drop first focus event, to avoid problems
-	(allow to go easily to newer history entries) */
-	window.onfocus = function() {
-		window.onfocus = null;
-		window.history.back();
-	};
-}, 1000);
+const STATE_BACK = "back";
+const STATE_FORWARD = "forward";
+
+function switch_state(new_state) {
+	history.replaceState(
+		new_state,
+		document.title,
+		location.pathname+location.hash);
+}
+
+function go_back() {
+	switch_state(STATE_FORWARD);
+	history.back();
+}
+function go_forward() {
+	switch_state(STATE_BACK);
+	history.forward();
+}
+
+// there are three states
+// default: register focus listener,
+//	    on focus: go back and switch to the state forward
+// back: user came from a later history entry
+//	 -> switch to the state forward,
+//	    forward him to the previous history entry
+// forward: user came from a previous history entry
+//	 -> switch to the state back,
+//	    forward him to the next history entry
+switch (history.state) {
+	case STATE_BACK:
+		go_back();
+		break;
+	case STATE_FORWARD:
+		go_forward();
+		break;
+	default:
+		if (!document.hidden) {
+			go_back();
+			break;
+		}
+		
+		document.addEventListener("visibilitychange", go_back);
+		break;
+}
 {% endblock %}
 
 {% block content %}
 <noscript><p>Javascript isn't enabled. So you need to manually go back in history to restore this tab.</p></noscript>
+<p>If you see this site something went wrong or you reached the end of the history or you disabled javascript.</p>
 {% endblock %}

From f7b0ac503ec7339109b04abb5e03b4462a10f365 Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Wed, 29 Nov 2017 02:29:53 -0600
Subject: [PATCH 054/322] generate pytest envs with tox factors

This eliminates all separate pytest envs in favor of conditionals in
[testenv]. This requires renaming some environments to make the lack of
certain functionality explicit:

- instead of omitting pyqt{version}, use pyqtlink to use host PyQt

tox.ini: eliminate -nocov

It is possible to set the `PYTEST_ADDOPTS` environment variable to
enable coverage checks, rather than a new command.
---
 tox.ini | 142 ++++++++++++++------------------------------------------
 1 file changed, 34 insertions(+), 108 deletions(-)

diff --git a/tox.ini b/tox.ini
index c0395a621..f805e006b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,120 +13,24 @@ skipsdist = true
 setenv =
     QT_QPA_PLATFORM_PLUGIN_PATH={envdir}/Lib/site-packages/PyQt5/plugins/platforms
     PYTEST_QT_API=pyqt5
+    pyqt{,56,571,58,59}: QUTE_BDD_WEBENGINE=true
+    cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
 passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER
+basepython =
+    py35: python3.5
+    py36: python3.6
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-tests.txt
+    pyqt: PyQt5
+    pyqt56: PyQt5==5.6
+    pyqt571: PyQt5==5.7.1
+    pyqt58: PyQt5==5.8.2
+    pyqt59: PyQt5==5.9.2
 commands =
-    {envpython} scripts/link_pyqt.py --tox {envdir}
+    pyqtlink: {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -bb -m pytest {posargs:tests}
-
-# test envs with PyQt5 from PyPI
-
-[testenv:py35-pyqt56]
-basepython = python3.5
-setenv =
-    {[testenv]setenv}
-    QUTE_BDD_WEBENGINE=true
-passenv = {[testenv]passenv}
-deps =
-    {[testenv]deps}
-    PyQt5==5.6
-commands = {envpython} -bb -m pytest {posargs:tests}
-
-[testenv:py35-pyqt571]
-basepython = python3.5
-setenv =
-    {[testenv]setenv}
-    QUTE_BDD_WEBENGINE=true
-passenv = {[testenv]passenv}
-deps =
-    {[testenv]deps}
-    PyQt5==5.7.1
-commands = {envpython} -bb -m pytest {posargs:tests}
-
-[testenv:py36-pyqt571]
-basepython = python3.6
-setenv =
-    {[testenv]setenv}
-    QUTE_BDD_WEBENGINE=true
-passenv = {[testenv]passenv}
-deps =
-    {[testenv]deps}
-    PyQt5==5.7.1
-commands = {envpython} -bb -m pytest {posargs:tests}
-
-[testenv:py35-pyqt58]
-basepython = python3.5
-setenv =
-    {[testenv]setenv}
-    QUTE_BDD_WEBENGINE=true
-passenv = {[testenv]passenv}
-deps =
-    {[testenv]deps}
-    PyQt5==5.8.2
-commands = {envpython} -bb -m pytest {posargs:tests}
-
-[testenv:py36-pyqt58]
-basepython = {env:PYTHON:python3.6}
-setenv =
-    {[testenv]setenv}
-    QUTE_BDD_WEBENGINE=true
-passenv = {[testenv]passenv}
-deps =
-    {[testenv]deps}
-    PyQt5==5.8.2
-commands = {envpython} -bb -m pytest {posargs:tests}
-
-[testenv:py35-pyqt59]
-basepython = python3.5
-setenv =
-    {[testenv]setenv}
-    QUTE_BDD_WEBENGINE=true
-passenv = {[testenv]passenv}
-deps =
-    {[testenv]deps}
-    PyQt5==5.9.2
-commands = {envpython} -bb -m pytest {posargs:tests}
-
-[testenv:py36-pyqt59]
-basepython = {env:PYTHON:python3.6}
-setenv =
-    {[testenv]setenv}
-    QUTE_BDD_WEBENGINE=true
-passenv = {[testenv]passenv}
-deps =
-    {[testenv]deps}
-    PyQt5==5.9.2
-commands = {envpython} -bb -m pytest {posargs:tests}
-
-# test envs with coverage
-
-[testenv:py35-pyqt59-cov]
-basepython = python3.5
-setenv =
-    {[testenv]setenv}
-    QUTE_BDD_WEBENGINE=true
-passenv = {[testenv]passenv}
-deps =
-    {[testenv]deps}
-    PyQt5==5.9.2
-commands =
-    {envpython} -bb -m pytest --cov --cov-report xml --cov-report=html --cov-report= {posargs:tests}
-    {envpython} scripts/dev/check_coverage.py {posargs}
-
-[testenv:py36-pyqt59-cov]
-basepython = python3.6
-setenv =
-    {[testenv]setenv}
-    QUTE_BDD_WEBENGINE=true
-passenv = {[testenv]passenv}
-deps =
-    {[testenv]deps}
-    PyQt5==5.9.2
-commands =
-    {envpython} -bb -m pytest --cov --cov-report xml --cov-report=html --cov-report= {posargs:tests}
-    {envpython} scripts/dev/check_coverage.py {posargs}
+    cov: {envpython} scripts/dev/check_coverage.py {posargs}
 
 # other envs
 
@@ -196,6 +100,16 @@ setenv = PYTHONPATH={toxinidir}
 commands =
     {envpython} scripts/dev/run_vulture.py
 
+[testenv:vulture-pyqtlink]
+basepython = python3
+deps =
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/misc/requirements/requirements-vulture.txt
+setenv = PYTHONPATH={toxinidir}
+commands =
+    {envpython} scripts/link_pyqt.py --tox {envdir}
+    {envpython} scripts/dev/run_vulture.py
+
 [testenv:pylint]
 basepython = {env:PYTHON:python3}
 ignore_errors = true
@@ -208,6 +122,18 @@ commands =
     {envpython} -m pylint scripts qutebrowser --output-format=colorized --reports=no {posargs}
     {envpython} scripts/dev/run_pylint_on_tests.py {toxinidir} --output-format=colorized --reports=no {posargs}
 
+[testenv:pylint-pyqtlink]
+basepython = {env:PYTHON:python3}
+ignore_errors = true
+passenv =
+deps =
+    {[testenv]deps}
+    -r{toxinidir}/misc/requirements/requirements-pylint.txt
+commands =
+    {envpython} scripts/link_pyqt.py --tox {envdir}
+    {envpython} -m pylint scripts qutebrowser --output-format=colorized --reports=no {posargs}
+    {envpython} scripts/dev/run_pylint_on_tests.py {toxinidir} --output-format=colorized --reports=no {posargs}
+
 [testenv:pylint-master]
 basepython = python3
 passenv = {[testenv:pylint]passenv}

From 2f231c86ac76cd47038759331b3a1b26418043e0 Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Thu, 30 Nov 2017 08:35:02 -0600
Subject: [PATCH 055/322] update tox env name in CI config

Use py36-pyqtlink instead of py36 for macOS
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 65d917d73..e92df0b6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ matrix:
     - os: linux
       env: TESTENV=py36-pyqt59-cov
     - os: osx
-      env: TESTENV=py36 OSX=sierra
+      env: TESTENV=py36-pyqtlink OSX=sierra
       osx_image: xcode8.3
       language: generic
     # https://github.com/qutebrowser/qutebrowser/issues/2013

From b58cfead05b201c3664fde8657556c5b260a9e6a Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Thu, 30 Nov 2017 16:05:01 +0100
Subject: [PATCH 056/322] style fixed

---
 qutebrowser/browser/qutescheme.py |  4 ++--
 qutebrowser/html/back.html        |  5 +++--
 qutebrowser/misc/sessions.py      | 10 +++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 9771f6db1..247e12a78 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -433,8 +433,8 @@ def qute_back(url):
     Simple page to free ram / lazy load a site, goes back on focusing the tab.
     """
     html = jinja.render(
-            'back.html',
-            title='Suspended: ' + urllib.parse.unquote(url.fragment()))
+        'back.html',
+        title='Suspended: ' + urllib.parse.unquote(url.fragment()))
     return 'text/html', html
 
 
diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index 94d16824e..b6190feda 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -8,13 +8,14 @@ function switch_state(new_state) {
 	history.replaceState(
 		new_state,
 		document.title,
-		location.pathname+location.hash);
+		location.pathname + location.hash);
 }
 
 function go_back() {
 	switch_state(STATE_FORWARD);
 	history.back();
 }
+
 function go_forward() {
 	switch_state(STATE_BACK);
 	history.forward();
@@ -49,5 +50,5 @@ switch (history.state) {
 
 {% block content %}
 <noscript><p>Javascript isn't enabled. So you need to manually go back in history to restore this tab.</p></noscript>
-<p>If you see this site something went wrong or you reached the end of the history or you disabled javascript.</p>
+<p>If you see this site something went wrong, or you reached the end of the history, or you disabled javascript.</p>
 {% endblock %}
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 1b0106f1b..237e46189 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -336,11 +336,11 @@ class SessionManager(QObject):
         # -> dropwhile empty if not session.lazy_session
         lazy_index = len(data['history'])
         gen = itertools.chain(
-                itertools.takewhile(lambda _: not lazy_load,
-                                    enumerate(data['history'])),
-                enumerate(lazy_load),
-                itertools.dropwhile(lambda i: i[0] < lazy_index,
-                                    enumerate(data['history'])))
+            itertools.takewhile(lambda _: not lazy_load,
+                                enumerate(data['history'])),
+            enumerate(lazy_load),
+            itertools.dropwhile(lambda i: i[0] < lazy_index,
+                                enumerate(data['history'])))
 
         for i, histentry in gen:
             user_data = {}

From a5d0b9851ace4a3a335748925cc971b7f7407def Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Thu, 30 Nov 2017 14:14:11 -0600
Subject: [PATCH 057/322] tox.ini: remove pyqt5.6, use requirements-pyqt.txt

---
 tox.ini | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index f805e006b..1c87d1a6c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,8 +22,7 @@ basepython =
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-tests.txt
-    pyqt: PyQt5
-    pyqt56: PyQt5==5.6
+    pyqt: -r{toxinidir}/misc/requirements/requirements-pyqt.txt
     pyqt571: PyQt5==5.7.1
     pyqt58: PyQt5==5.8.2
     pyqt59: PyQt5==5.9.2

From 6b762037809b9057774bb88f333466d6d1ba9bd3 Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Thu, 30 Nov 2017 14:21:37 -0600
Subject: [PATCH 058/322] update contributing.asciidoc with -pyqtlink envs

---
 doc/contributing.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc
index afbb752c5..6f0b1bb72 100644
--- a/doc/contributing.asciidoc
+++ b/doc/contributing.asciidoc
@@ -97,7 +97,7 @@ unittests and several linters/checkers.
 Currently, the following tox environments are available:
 
 * Tests using https://www.pytest.org[pytest]:
-  - `py35`, `py36`: Run pytest for python 3.5/3.6 with the system-wide PyQt.
+  - `py35-pyqtlink`, `py36-pyqtlink`: Run pytest for python 3.5/3.6 with the system-wide PyQt.
   - `py36-pyqt57`, ..., `py36-pyqt59`: Run pytest with the given PyQt version (`py35-*` also works).
   - `py36-pyqt59-cov`: Run with coverage support (other Python/PyQt versions work too).
 * `flake8`: Run various linting checks via https://pypi.python.org/pypi/flake8[flake8].

From 49485ca220543ce9fbcc48da9f3b69feef695822 Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Thu, 30 Nov 2017 16:58:14 -0600
Subject: [PATCH 059/322] tox.ini: fix conditional syntax errors

`{[testenv]deps}` was passing conditionals in their raw form; this
simply lists them manually to avoid this.
---
 tox.ini | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tox.ini b/tox.ini
index 1c87d1a6c..de41f2e0f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -107,14 +107,15 @@ deps =
 setenv = PYTHONPATH={toxinidir}
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
-    {envpython} scripts/dev/run_vulture.py
+    {[testenv:vulture]commands}
 
 [testenv:pylint]
 basepython = {env:PYTHON:python3}
 ignore_errors = true
 passenv =
 deps =
-    {[testenv]deps}
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/misc/requirements/requirements-tests.txt
     -r{toxinidir}/misc/requirements/requirements-pylint.txt
     -r{toxinidir}/misc/requirements/requirements-pyqt.txt
 commands =
@@ -126,18 +127,19 @@ basepython = {env:PYTHON:python3}
 ignore_errors = true
 passenv =
 deps =
-    {[testenv]deps}
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/misc/requirements/requirements-tests.txt
     -r{toxinidir}/misc/requirements/requirements-pylint.txt
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
-    {envpython} -m pylint scripts qutebrowser --output-format=colorized --reports=no {posargs}
-    {envpython} scripts/dev/run_pylint_on_tests.py {toxinidir} --output-format=colorized --reports=no {posargs}
+    {[testenv:pylint]commands}
 
 [testenv:pylint-master]
 basepython = python3
 passenv = {[testenv:pylint]passenv}
 deps =
-    {[testenv]deps}
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/misc/requirements/requirements-tests.txt
     -r{toxinidir}/misc/requirements/requirements-pylint-master.txt
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}

From 780ac3f4c2bb5bd53d63531215f28dd07613d271 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Fri, 1 Dec 2017 11:34:47 -0500
Subject: [PATCH 060/322] Remove needles quteproc/server fixture deps.

A few step definitions listed these in the parameters although they were
unused.
---
 tests/end2end/features/test_editor_bdd.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py
index 983ded7ba..ec43c8477 100644
--- a/tests/end2end/features/test_editor_bdd.py
+++ b/tests/end2end/features/test_editor_bdd.py
@@ -49,7 +49,7 @@ def set_up_editor_replacement(quteproc, server, tmpdir, text, replacement):
 
 
 @bdd.when(bdd.parsers.parse('I set up a fake editor returning "{text}"'))
-def set_up_editor(quteproc, server, tmpdir, text):
+def set_up_editor(quteproc, tmpdir, text):
     """Set up editor.command to a small python script inserting a text."""
     script = tmpdir / 'script.py'
     script.write(textwrap.dedent("""
@@ -63,13 +63,13 @@ def set_up_editor(quteproc, server, tmpdir, text):
 
 
 @bdd.when(bdd.parsers.parse('I set up a fake editor returning empty text'))
-def set_up_editor_empty(quteproc, server, tmpdir):
+def set_up_editor_empty(quteproc, tmpdir):
     """Set up editor.command to a small python script inserting empty text."""
-    set_up_editor(quteproc, server, tmpdir, "")
+    set_up_editor(quteproc, tmpdir, "")
 
 
 @bdd.when(bdd.parsers.parse('I set up a fake editor that waits'))
-def set_up_editor_wait(quteproc, server, tmpdir):
+def set_up_editor_wait(quteproc, tmpdir):
     """Set up editor.command to a small python script inserting a text."""
     pidfile = tmpdir / 'editor_pid'
     script = tmpdir / 'script.py'
@@ -90,7 +90,7 @@ def set_up_editor_wait(quteproc, server, tmpdir):
 
 
 @bdd.when(bdd.parsers.parse('I kill the waiting editor'))
-def kill_editor_wait(quteproc, server, tmpdir):
+def kill_editor_wait(tmpdir):
     """Kill the waiting editor."""
     pidfile = tmpdir / 'editor_pid'
     pid = int(pidfile.read())

From df6ff55b7a34d543b9235bf71f0131b2598ff1c9 Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Fri, 1 Dec 2017 10:51:41 -0600
Subject: [PATCH 061/322] allow pytest to default to link_pyqt

link_pyqt now checks for LINK_PYQT_SKIP, allowing pytest env names like
`py36` to work properly without negative conditionals in tox.ini
---
 scripts/link_pyqt.py | 4 ++++
 tox.ini              | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/link_pyqt.py b/scripts/link_pyqt.py
index 57eeb9138..82f8cbac5 100644
--- a/scripts/link_pyqt.py
+++ b/scripts/link_pyqt.py
@@ -205,6 +205,10 @@ def main():
     args = parser.parse_args()
 
     if args.tox:
+        #workaround for the lack of negative factors in tox.ini
+        if 'LINK_PYQT_SKIP' in os.environ:
+            print('LINK_PYQT_SKIP set, exiting...')
+            sys.exit(0)
         executable = get_tox_syspython(args.path)
     else:
         executable = sys.executable
diff --git a/tox.ini b/tox.ini
index de41f2e0f..2ada5ab58 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,7 @@ skipsdist = true
 setenv =
     QT_QPA_PLATFORM_PLUGIN_PATH={envdir}/Lib/site-packages/PyQt5/plugins/platforms
     PYTEST_QT_API=pyqt5
+    pyqt{,56,571,58,59}: LINK_PYQT_SKIP=true
     pyqt{,56,571,58,59}: QUTE_BDD_WEBENGINE=true
     cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
 passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER
@@ -27,7 +28,7 @@ deps =
     pyqt58: PyQt5==5.8.2
     pyqt59: PyQt5==5.9.2
 commands =
-    pyqtlink: {envpython} scripts/link_pyqt.py --tox {envdir}
+    {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -bb -m pytest {posargs:tests}
     cov: {envpython} scripts/dev/check_coverage.py {posargs}
 

From 5607cc2be8c379c002dc257b3fd9a0d606ede98d Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Fri, 1 Dec 2017 10:52:58 -0600
Subject: [PATCH 062/322] Revert "update contributing.asciidoc with -pyqtlink
 envs"

This reverts commit 6b762037809b9057774bb88f333466d6d1ba9bd3.
---
 doc/contributing.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc
index 6f0b1bb72..afbb752c5 100644
--- a/doc/contributing.asciidoc
+++ b/doc/contributing.asciidoc
@@ -97,7 +97,7 @@ unittests and several linters/checkers.
 Currently, the following tox environments are available:
 
 * Tests using https://www.pytest.org[pytest]:
-  - `py35-pyqtlink`, `py36-pyqtlink`: Run pytest for python 3.5/3.6 with the system-wide PyQt.
+  - `py35`, `py36`: Run pytest for python 3.5/3.6 with the system-wide PyQt.
   - `py36-pyqt57`, ..., `py36-pyqt59`: Run pytest with the given PyQt version (`py35-*` also works).
   - `py36-pyqt59-cov`: Run with coverage support (other Python/PyQt versions work too).
 * `flake8`: Run various linting checks via https://pypi.python.org/pypi/flake8[flake8].

From fbd325f8d1a95507b656b3111b11d87d3e20aa1b Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Fri, 1 Dec 2017 10:55:08 -0600
Subject: [PATCH 063/322] Revert "update tox env name in CI config"

This reverts commit 2f231c86ac76cd47038759331b3a1b26418043e0.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e92df0b6b..65d917d73 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ matrix:
     - os: linux
       env: TESTENV=py36-pyqt59-cov
     - os: osx
-      env: TESTENV=py36-pyqtlink OSX=sierra
+      env: TESTENV=py36 OSX=sierra
       osx_image: xcode8.3
       language: generic
     # https://github.com/qutebrowser/qutebrowser/issues/2013

From b91a39be220c86fa2659e6cfa73b16c54a8686f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Chavant?= <github@mail.chavant.info>
Date: Sat, 2 Dec 2017 19:22:14 +0100
Subject: [PATCH 064/322] Run shellcheck on Travis CI

---
 .travis.yml                  |  3 +++
 scripts/dev/ci/travis_run.sh | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 65d917d73..37387b620 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,6 +52,9 @@ matrix:
       language: node_js
       python: null
       node_js: "lts/*"
+    - os: linux
+      env: TESTENV=shellcheck
+      services: docker
   fast_finish: true
 
 cache:
diff --git a/scripts/dev/ci/travis_run.sh b/scripts/dev/ci/travis_run.sh
index 2a5424fb9..70c41b0c3 100644
--- a/scripts/dev/ci/travis_run.sh
+++ b/scripts/dev/ci/travis_run.sh
@@ -14,6 +14,16 @@ elif [[ $TESTENV == eslint ]]; then
     # travis env
     cd qutebrowser/javascript || exit 1
     eslint --color --report-unused-disable-directives .
+elif [[ $TESTENV == shellcheck ]]; then
+    dev_scripts=$( find scripts/dev/ -name '*.sh' -print0 | xargs -0 )
+    # false positive: we are using 'find -exec +'
+    # shellcheck disable=SC2038
+    userscripts=$( find misc/userscripts/ -type f -exec grep -lE '[/ ][bd]ash$|[/ ]sh$|[/ ]ksh$' {} + | xargs )
+    IFS=" " read -r -a scripts <<< "$dev_scripts $userscripts"
+    docker run \
+           -v "$PWD:/outside" \
+	   -w /outside \
+           koalaman/shellcheck:stable "${scripts[@]}"
 else
     args=()
     [[ $TRAVIS_OS_NAME == osx ]] && args=('--qute-bdd-webengine' '--no-xvfb')

From 595a53ad3b29570bed35764b0b2cbfdda9af2dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Chavant?= <github@mail.chavant.info>
Date: Sat, 2 Dec 2017 19:23:55 +0100
Subject: [PATCH 065/322] Apply patch from #1697

---
 misc/userscripts/open_download    |  3 ++-
 misc/userscripts/password_fill    |  6 +++---
 misc/userscripts/qutedmenu        | 12 +++---------
 misc/userscripts/taskadd          |  6 +++---
 scripts/dev/ci/travis_install.sh  |  6 +++---
 scripts/dev/quit_segfault_test.sh | 10 ++++------
 6 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/misc/userscripts/open_download b/misc/userscripts/open_download
index 6c1213b65..85ea7f849 100755
--- a/misc/userscripts/open_download
+++ b/misc/userscripts/open_download
@@ -76,6 +76,7 @@ crop-first-column() {
 ls-files() {
     # add the slash at the end of the download dir enforces to follow the
     # symlink, if the DOWNLOAD_DIR itself is a symlink
+    # shellcheck disable=SC2010
     ls -Q --quoting-style escape    -h  -o -1 -A -t "${DOWNLOAD_DIR}/" \
         | grep '^[-]' \
         | cut -d' ' -f3- \
@@ -94,7 +95,7 @@ fi
 line=$(printf "%s\n" "${entries[@]}"  \
        | crop-first-column 55 \
        | column -s $'\t' -t \
-       | $ROFI_CMD "${rofi_default_args[@]}" $ROFI_ARGS) || true
+       | $ROFI_CMD "${rofi_default_args[@]}" "$ROFI_ARGS") || true
 if [ -z "$line" ];  then
     exit 0
 fi
diff --git a/misc/userscripts/password_fill b/misc/userscripts/password_fill
index af394ac2c..f2157f190 100755
--- a/misc/userscripts/password_fill
+++ b/misc/userscripts/password_fill
@@ -236,7 +236,7 @@ pass_backend() {
         if ((match_line)) ; then
             # add entries with matching URL-tag
             while read -r -d "" passfile ; do
-                if $GPG "${GPG_OPTS}" -d "$passfile" \
+                if $GPG "${GPG_OPTS[@]}" -d "$passfile" \
                      | grep --max-count=1 -iE "${match_line_pattern}${url}" > /dev/null
                 then
                     passfile="${passfile#$PREFIX}"
@@ -269,7 +269,7 @@ pass_backend() {
                     break
                 fi
             fi
-        done < <($GPG "${GPG_OPTS}" -d "$path" )
+        done < <($GPG "${GPG_OPTS[@]}" -d "$path" )
     }
 }
 # =======================================================
@@ -283,7 +283,7 @@ secret_backend() {
     query_entries() {
         local domain="$1"
         while read -r line ; do
-            if [[ "$line" =~ "attribute.username = " ]] ; then
+            if [[ "$line" == "attribute.username ="* ]] ; then
                 files+=("$domain ${line#${BASH_REMATCH[0]}}")
             fi
         done < <( secret-tool search --unlock --all domain "$domain" 2>&1 )
diff --git a/misc/userscripts/qutedmenu b/misc/userscripts/qutedmenu
index 3f8b13514..b753c6d5b 100755
--- a/misc/userscripts/qutedmenu
+++ b/misc/userscripts/qutedmenu
@@ -35,17 +35,11 @@ get_selection() {
 
 # Main
 # https://github.com/halfwit/dotfiles/blob/master/.config/dmenu/font
-if [[ -s $confdir/dmenu/font ]]; then
-    read -r font < "$confdir"/dmenu/font
-fi
+[[ -s $confdir/dmenu/font ]] && read -r font < "$confdir"/dmenu/font
 
-if [[ $font ]]; then
-    opts+=(-fn "$font")
-fi
+[[ $font ]] && opts+=(-fn "$font")
 
-if [[ -s $optsfile ]]; then
-    source "$optsfile"
-fi
+[[ -s $optsfile ]] && source "$optsfile"
 
 url=$(get_selection)
 url=${url/*http/http}
diff --git a/misc/userscripts/taskadd b/misc/userscripts/taskadd
index 6add71c68..9c70fb978 100755
--- a/misc/userscripts/taskadd
+++ b/misc/userscripts/taskadd
@@ -25,12 +25,12 @@
 [[ $QUTE_MODE == 'hints' ]] && title=$QUTE_SELECTED_TEXT || title=$QUTE_TITLE
 
 # try to add the task and grab the output
-msg="$(task add $title $@ 2>&1)"
+msg="$(task add "$title" "$*" 2>&1)"
 
 if [[ $? == 0 ]]; then
     # annotate the new task with the url, send the output back to the browser
     task +LATEST annotate "$QUTE_URL"
-    echo "message-info '$msg'" >> $QUTE_FIFO
+    echo "message-info '$msg'" >> "$QUTE_FIFO"
 else
-    echo "message-error '$msg'" >> $QUTE_FIFO
+    echo "message-error '$msg'" >> "$QUTE_FIFO"
 fi
diff --git a/scripts/dev/ci/travis_install.sh b/scripts/dev/ci/travis_install.sh
index 4c599aac6..45bb5fe1e 100644
--- a/scripts/dev/ci/travis_install.sh
+++ b/scripts/dev/ci/travis_install.sh
@@ -27,17 +27,17 @@ travis_retry() {
     local count=1
     while (( count < 3 )); do
         if (( result != 0 )); then
-            echo -e "\n${ANSI_RED}The command \"$@\" failed. Retrying, $count of 3.${ANSI_RESET}\n" >&2
+            echo -e "\n${ANSI_RED}The command \"$*\" failed. Retrying, $count of 3.${ANSI_RESET}\n" >&2
         fi
         "$@"
         result=$?
         (( result == 0 )) && break
-        count=$(($count + 1))
+        count=$(( count + 1 ))
         sleep 1
     done
 
     if (( count > 3 )); then
-        echo -e "\n${ANSI_RED}The command \"$@\" failed 3 times.${ANSI_RESET}\n" >&2
+        echo -e "\n${ANSI_RED}The command \"$*\" failed 3 times.${ANSI_RESET}\n" >&2
     fi
 
     return $result
diff --git a/scripts/dev/quit_segfault_test.sh b/scripts/dev/quit_segfault_test.sh
index 655eb262a..389f125b9 100755
--- a/scripts/dev/quit_segfault_test.sh
+++ b/scripts/dev/quit_segfault_test.sh
@@ -1,14 +1,12 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-if [[ $PWD == */scripts ]]; then
-    cd ..
-fi
+[[ $PWD == */scripts ]] && cd ..
 
 echo > crash.log
 while :; do
     exit=0
-    while (( $exit == 0)); do
-        duration=$(($RANDOM%10000))
+    while (( exit == 0 )); do
+        duration=$(( RANDOM % 10000 ))
         python3 -m qutebrowser --debug ":later $duration quit" http://www.heise.de/
         exit=$?
     done

From 31710b7045923dc984035984565f23b76a4d5ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Chavant?= <github@mail.chavant.info>
Date: Sat, 2 Dec 2017 19:31:52 +0100
Subject: [PATCH 066/322] Trivial fixes for shellcheck warnings

---
 misc/userscripts/cast              |  4 ++--
 misc/userscripts/dmenu_qutebrowser |  2 +-
 misc/userscripts/format_json       |  4 ++--
 misc/userscripts/open_download     |  2 +-
 misc/userscripts/password_fill     |  5 +++--
 misc/userscripts/qutedmenu         |  1 +
 misc/userscripts/rss               | 10 +++++-----
 scripts/dev/ci/travis_backtrace.sh |  2 +-
 scripts/dev/ci/travis_install.sh   |  8 ++++----
 scripts/dev/download_release.sh    |  6 +++---
 10 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/misc/userscripts/cast b/misc/userscripts/cast
index da68297d8..f7b64df70 100755
--- a/misc/userscripts/cast
+++ b/misc/userscripts/cast
@@ -144,7 +144,7 @@ fi
 pkill -f "${program_}"
 
 # start youtube download in stream mode (-o -) into temporary file
-youtube-dl -qo - "$1" > ${file_to_cast} &
+youtube-dl -qo - "$1" > "${file_to_cast}" &
 ytdl_pid=$!
 
 msg info "Casting $1" >> "$QUTE_FIFO"
@@ -153,4 +153,4 @@ tail -F "${file_to_cast}" | ${program_} -
 
 # cleanup remaining background process and file on disk
 kill ${ytdl_pid}
-rm -rf ${tmpdir}
+rm -rf "${tmpdir}"
diff --git a/misc/userscripts/dmenu_qutebrowser b/misc/userscripts/dmenu_qutebrowser
index 9c809d5ad..82e6d2f18 100755
--- a/misc/userscripts/dmenu_qutebrowser
+++ b/misc/userscripts/dmenu_qutebrowser
@@ -41,7 +41,7 @@
 [ -z "$QUTE_URL" ] && QUTE_URL='http://google.com'
 
 url=$(echo "$QUTE_URL" | cat - "$QUTE_CONFIG_DIR/quickmarks" "$QUTE_DATA_DIR/history" | dmenu -l 15 -p qutebrowser)
-url=$(echo "$url" | sed -E 's/[^ ]+ +//g' | egrep "https?:" || echo "$url")
+url=$(echo "$url" | sed -E 's/[^ ]+ +//g' | grep -E "https?:" || echo "$url")
 
 [ -z "${url// }" ] && exit
 
diff --git a/misc/userscripts/format_json b/misc/userscripts/format_json
index f756850f1..42d8dea14 100755
--- a/misc/userscripts/format_json
+++ b/misc/userscripts/format_json
@@ -35,12 +35,12 @@ FILE_SIZE=$(ls -s --block-size=1048576 "$QUTE_TEXT" | cut -d' ' -f1)
 
 # use pygments to pretty-up the json (syntax highlight) if file is less than 10MB
 if [ "$FILE_SIZE" -lt "10" ]; then
-    FORMATTED_JSON="$(echo "$FORMATTED_JSON" | pygmentize -l json -f html -O full,style=$STYLE)"
+    FORMATTED_JSON="$(echo "$FORMATTED_JSON" | pygmentize -l json -f html -O full,style="$STYLE")"
 fi
 
 # create a temp file and write the formatted json to that file
 TEMP_FILE="$(mktemp --suffix '.html')"
-echo "$FORMATTED_JSON" > $TEMP_FILE
+echo "$FORMATTED_JSON" > "$TEMP_FILE"
 
 
 # send the command to qutebrowser to open the new file containing the formatted json
diff --git a/misc/userscripts/open_download b/misc/userscripts/open_download
index 85ea7f849..ecc1d7209 100755
--- a/misc/userscripts/open_download
+++ b/misc/userscripts/open_download
@@ -92,7 +92,7 @@ if [ "${#entries[@]}" -eq 0 ] ; then
     die "Download directory »${DOWNLOAD_DIR}« empty"
 fi
 
-line=$(printf "%s\n" "${entries[@]}"  \
+line=$(printf '%s\n' "${entries[@]}"  \
        | crop-first-column 55 \
        | column -s $'\t' -t \
        | $ROFI_CMD "${rofi_default_args[@]}" "$ROFI_ARGS") || true
diff --git a/misc/userscripts/password_fill b/misc/userscripts/password_fill
index f2157f190..22497d987 100755
--- a/misc/userscripts/password_fill
+++ b/misc/userscripts/password_fill
@@ -178,7 +178,7 @@ choose_entry_menu() {
     if [ "$nr" -eq 1 ] && ! ((menu_if_one_entry)) ; then
         file="${files[0]}"
     else
-        file=$( printf "%s\n" "${files[@]}" | "${MENU_COMMAND[@]}" )
+        file=$( printf '%s\n' "${files[@]}" | "${MENU_COMMAND[@]}" )
     fi
 }
 
@@ -303,6 +303,7 @@ pass_backend
 QUTE_CONFIG_DIR=${QUTE_CONFIG_DIR:-${XDG_CONFIG_HOME:-$HOME/.config}/qutebrowser/}
 PWFILL_CONFIG=${PWFILL_CONFIG:-${QUTE_CONFIG_DIR}/password_fill_rc}
 if [ -f "$PWFILL_CONFIG" ] ; then
+    # shellcheck source=/dev/null
     source "$PWFILL_CONFIG"
 fi
 init
@@ -311,7 +312,7 @@ simplify_url "$QUTE_URL"
 query_entries "${simple_url}"
 no_entries_found
 # remove duplicates
-mapfile -t files < <(printf "%s\n" "${files[@]}" | sort | uniq )
+mapfile -t files < <(printf '%s\n' "${files[@]}" | sort | uniq )
 choose_entry
 if [ -z "$file" ] ; then
     # choose_entry didn't want any of these entries
diff --git a/misc/userscripts/qutedmenu b/misc/userscripts/qutedmenu
index b753c6d5b..de1b8d641 100755
--- a/misc/userscripts/qutedmenu
+++ b/misc/userscripts/qutedmenu
@@ -39,6 +39,7 @@ get_selection() {
 
 [[ $font ]] && opts+=(-fn "$font")
 
+# shellcheck source=/dev/null
 [[ -s $optsfile ]] && source "$optsfile"
 
 url=$(get_selection)
diff --git a/misc/userscripts/rss b/misc/userscripts/rss
index 222d990a2..6680a259e 100755
--- a/misc/userscripts/rss
+++ b/misc/userscripts/rss
@@ -32,7 +32,7 @@ add_feed () {
     if grep -Fq "$1" "feeds"; then
         notice "$1 is saved already."
     else
-        printf "%s\n" "$1" >> "feeds"
+        printf '%s\n' "$1" >> "feeds"
     fi
 }
 
@@ -57,7 +57,7 @@ notice () {
 
 # Update a database of a feed and open new URLs
 read_items () {
-    cd read_urls
+    cd read_urls || return
     feed_file="$(echo "$1" | tr -d /)"
     feed_temp_file="$(mktemp "$feed_file.tmp.XXXXXXXXXX")"
     feed_new_items="$(mktemp "$feed_file.new.XXXXXXXXXX")"
@@ -75,7 +75,7 @@ read_items () {
         cat "$feed_new_items" >> "$feed_file"
         sort -o "$feed_file" "$feed_file"
         rm "$feed_temp_file" "$feed_new_items"
-    fi | while read item; do
+    fi | while read -r item; do
         echo "open -t $item" > "$QUTE_FIFO"
     done
 }
@@ -85,7 +85,7 @@ if [ ! -d "$config_dir/read_urls" ]; then
     mkdir -p "$config_dir/read_urls"
 fi
 
-cd "$config_dir"
+cd "$config_dir" || exit
 
 if [ $# != 0 ]; then
     for arg in "$@"; do
@@ -115,7 +115,7 @@ if < /dev/null grep --help 2>&1 | grep -q -- -a; then
     text_only="-a"
 fi
 
-while read feed_url; do
+while read -r feed_url; do
     read_items "$feed_url" &
 done < "$config_dir/feeds"
 
diff --git a/scripts/dev/ci/travis_backtrace.sh b/scripts/dev/ci/travis_backtrace.sh
index c94d1ff06..4027f7c10 100644
--- a/scripts/dev/ci/travis_backtrace.sh
+++ b/scripts/dev/ci/travis_backtrace.sh
@@ -6,7 +6,7 @@
 
 case $TESTENV in
     py3*-pyqt*)
-        exe=$(readlink -f .tox/$TESTENV/bin/python)
+        exe=$(readlink -f ".tox/$TESTENV/bin/python")
         full=
         ;;
     *)
diff --git a/scripts/dev/ci/travis_install.sh b/scripts/dev/ci/travis_install.sh
index 45bb5fe1e..18ac44048 100644
--- a/scripts/dev/ci/travis_install.sh
+++ b/scripts/dev/ci/travis_install.sh
@@ -21,13 +21,13 @@
 # Stolen from https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/templates/header.sh
 # and adjusted to use ((...))
 travis_retry() {
-    local ANSI_RED="\033[31;1m"
-    local ANSI_RESET="\033[0m"
+    local ANSI_RED='\033[31;1m'
+    local ANSI_RESET='\033[0m'
     local result=0
     local count=1
     while (( count < 3 )); do
         if (( result != 0 )); then
-            echo -e "\n${ANSI_RED}The command \"$*\" failed. Retrying, $count of 3.${ANSI_RESET}\n" >&2
+            echo -e "\\n${ANSI_RED}The command \"$*\" failed. Retrying, $count of 3.${ANSI_RESET}\\n" >&2
         fi
         "$@"
         result=$?
@@ -37,7 +37,7 @@ travis_retry() {
     done
 
     if (( count > 3 )); then
-        echo -e "\n${ANSI_RED}The command \"$*\" failed 3 times.${ANSI_RESET}\n" >&2
+        echo -e "\\n${ANSI_RED}The command \"$*\" failed 3 times.${ANSI_RESET}\\n" >&2
     fi
 
     return $result
diff --git a/scripts/dev/download_release.sh b/scripts/dev/download_release.sh
index 7ec4d9159..66242ec8e 100644
--- a/scripts/dev/download_release.sh
+++ b/scripts/dev/download_release.sh
@@ -11,7 +11,7 @@ if [[ $# != 1 ]]; then
     exit 1
 fi
 
-cd "$tmpdir"
+cd "$tmpdir" || exit
 mkdir windows
 
 base="https://github.com/qutebrowser/qutebrowser/releases/download/v$1"
@@ -21,13 +21,13 @@ wget "$base/qutebrowser-$1.tar.gz.asc" || exit 1
 wget "$base/qutebrowser-$1.dmg" || exit 1
 wget "$base/qutebrowser_${1}-1_all.deb" || exit 1
 
-cd windows
+cd windows || exit
 wget "$base/qutebrowser-${1}-amd64.msi" || exit 1
 wget "$base/qutebrowser-${1}-win32.msi" || exit 1
 wget "$base/qutebrowser-${1}-windows-standalone-amd64.zip" || exit 1
 wget "$base/qutebrowser-${1}-windows-standalone-win32.zip" || exit 1
 
 dest="/srv/http/qutebrowser/releases/v$1"
-cd "$oldpwd"
+cd "$oldpwd" || exit
 sudo mv "$tmpdir" "$dest"
 sudo chown -R http:http "$dest"

From dd589f180bdd97670673957c43d4dfccd2ae6054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Chavant?= <github@mail.chavant.info>
Date: Sat, 2 Dec 2017 19:38:02 +0100
Subject: [PATCH 067/322] Fix remaining shellcheck warnings

---
 misc/userscripts/format_json       |  7 +++----
 misc/userscripts/password_fill     |  2 +-
 misc/userscripts/taskadd           |  4 +---
 misc/userscripts/view_in_mpv       |  2 +-
 scripts/dev/ci/travis_backtrace.sh |  2 +-
 scripts/dev/download_release.sh    | 23 ++++++++++++-----------
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/misc/userscripts/format_json b/misc/userscripts/format_json
index 42d8dea14..10ff23e53 100755
--- a/misc/userscripts/format_json
+++ b/misc/userscripts/format_json
@@ -22,15 +22,14 @@
 # default style to monokai if none is provided
 STYLE=${1:-monokai}
 # format json using jq
-FORMATTED_JSON="$(cat "$QUTE_TEXT" | jq '.')"
-
-# if jq command failed or formatted json is empty, assume failure and terminate
-if [ $? -ne 0 ] || [ -z "$FORMATTED_JSON" ]; then
+if ! FORMATTED_JSON="$(jq . "$QUTE_TEXT")" ||  [ -z "$FORMATTED_JSON" ]; then
     echo "Invalid json, aborting..."
     exit 1
 fi
 
 # calculate the filesize of the json document
+# parsing the output of ls should be fine in this case since we set the block size
+# shellcheck disable=SC2012
 FILE_SIZE=$(ls -s --block-size=1048576 "$QUTE_TEXT" | cut -d' ' -f1)
 
 # use pygments to pretty-up the json (syntax highlight) if file is less than 10MB
diff --git a/misc/userscripts/password_fill b/misc/userscripts/password_fill
index 22497d987..5f30a6bf6 100755
--- a/misc/userscripts/password_fill
+++ b/misc/userscripts/password_fill
@@ -64,7 +64,7 @@ die() {
 javascript_escape() {
     # print the first argument in an escaped way, such that it can safely
     # be used within javascripts double quotes
-    sed "s,[\\\'\"],\\\&,g" <<< "$1"
+    sed "s,[\\\\'\"],\\\\&,g" <<< "$1"
 }
 
 # ======================================================= #
diff --git a/misc/userscripts/taskadd b/misc/userscripts/taskadd
index 9c70fb978..b1ded245c 100755
--- a/misc/userscripts/taskadd
+++ b/misc/userscripts/taskadd
@@ -25,9 +25,7 @@
 [[ $QUTE_MODE == 'hints' ]] && title=$QUTE_SELECTED_TEXT || title=$QUTE_TITLE
 
 # try to add the task and grab the output
-msg="$(task add "$title" "$*" 2>&1)"
-
-if [[ $? == 0 ]]; then
+if msg="$(task add "$title" "$*" 2>&1)"; then
     # annotate the new task with the url, send the output back to the browser
     task +LATEST annotate "$QUTE_URL"
     echo "message-info '$msg'" >> "$QUTE_FIFO"
diff --git a/misc/userscripts/view_in_mpv b/misc/userscripts/view_in_mpv
index 9eb6ff7c6..f465fc4e4 100755
--- a/misc/userscripts/view_in_mpv
+++ b/misc/userscripts/view_in_mpv
@@ -50,7 +50,7 @@ msg() {
 MPV_COMMAND=${MPV_COMMAND:-mpv}
 # Warning: spaces in single flags are not supported
 MPV_FLAGS=${MPV_FLAGS:- --force-window --no-terminal --keep-open=yes --ytdl --ytdl-raw-options=yes-playlist=}
-video_command=( "$MPV_COMMAND"  $MPV_FLAGS )
+IFS=" " read -r -a video_command <<< "$MPV_COMMAND $MPV_FLAGS"
 
 js() {
 cat <<EOF
diff --git a/scripts/dev/ci/travis_backtrace.sh b/scripts/dev/ci/travis_backtrace.sh
index 4027f7c10..227dde8a8 100644
--- a/scripts/dev/ci/travis_backtrace.sh
+++ b/scripts/dev/ci/travis_backtrace.sh
@@ -15,4 +15,4 @@ case $TESTENV in
         ;;
 esac
 
-find . -name *.core -o -name core -exec gdb --batch --quiet -ex "thread apply all bt $full" "$exe" {} \;
+find . \( -name "*.core" -o -name core \) -exec gdb --batch --quiet -ex "thread apply all bt $full" "$exe" {} \;
diff --git a/scripts/dev/download_release.sh b/scripts/dev/download_release.sh
index 66242ec8e..207da21c8 100644
--- a/scripts/dev/download_release.sh
+++ b/scripts/dev/download_release.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # This script downloads the given release from GitHub so we can mirror it on
 # qutebrowser.org.
@@ -11,23 +12,23 @@ if [[ $# != 1 ]]; then
     exit 1
 fi
 
-cd "$tmpdir" || exit
+cd "$tmpdir"
 mkdir windows
 
 base="https://github.com/qutebrowser/qutebrowser/releases/download/v$1"
 
-wget "$base/qutebrowser-$1.tar.gz" || exit 1
-wget "$base/qutebrowser-$1.tar.gz.asc" || exit 1
-wget "$base/qutebrowser-$1.dmg" || exit 1
-wget "$base/qutebrowser_${1}-1_all.deb" || exit 1
+wget "$base/qutebrowser-$1.tar.gz"
+wget "$base/qutebrowser-$1.tar.gz.asc"
+wget "$base/qutebrowser-$1.dmg"
+wget "$base/qutebrowser_${1}-1_all.deb"
 
-cd windows || exit
-wget "$base/qutebrowser-${1}-amd64.msi" || exit 1
-wget "$base/qutebrowser-${1}-win32.msi" || exit 1
-wget "$base/qutebrowser-${1}-windows-standalone-amd64.zip" || exit 1
-wget "$base/qutebrowser-${1}-windows-standalone-win32.zip" || exit 1
+cd windows
+wget "$base/qutebrowser-${1}-amd64.msi"
+wget "$base/qutebrowser-${1}-win32.msi"
+wget "$base/qutebrowser-${1}-windows-standalone-amd64.zip"
+wget "$base/qutebrowser-${1}-windows-standalone-win32.zip"
 
 dest="/srv/http/qutebrowser/releases/v$1"
-cd "$oldpwd" || exit
+cd "$oldpwd"
 sudo mv "$tmpdir" "$dest"
 sudo chown -R http:http "$dest"

From ccb8e74998b5b186482db3bfe92917829431ab20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Chavant?= <github@mail.chavant.info>
Date: Sun, 3 Dec 2017 09:29:38 +0100
Subject: [PATCH 068/322] Use koalaman/shellcheck:latest

---
 scripts/dev/ci/travis_run.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/dev/ci/travis_run.sh b/scripts/dev/ci/travis_run.sh
index 70c41b0c3..f4960b808 100644
--- a/scripts/dev/ci/travis_run.sh
+++ b/scripts/dev/ci/travis_run.sh
@@ -16,14 +16,12 @@ elif [[ $TESTENV == eslint ]]; then
     eslint --color --report-unused-disable-directives .
 elif [[ $TESTENV == shellcheck ]]; then
     dev_scripts=$( find scripts/dev/ -name '*.sh' -print0 | xargs -0 )
-    # false positive: we are using 'find -exec +'
-    # shellcheck disable=SC2038
     userscripts=$( find misc/userscripts/ -type f -exec grep -lE '[/ ][bd]ash$|[/ ]sh$|[/ ]ksh$' {} + | xargs )
     IFS=" " read -r -a scripts <<< "$dev_scripts $userscripts"
     docker run \
            -v "$PWD:/outside" \
 	   -w /outside \
-           koalaman/shellcheck:stable "${scripts[@]}"
+           koalaman/shellcheck:latest "${scripts[@]}"
 else
     args=()
     [[ $TRAVIS_OS_NAME == osx ]] && args=('--qute-bdd-webengine' '--no-xvfb')

From 22e4a800a1c6080d29d41eeda229bc67b7bf314b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Chavant?= <github@mail.chavant.info>
Date: Sun, 3 Dec 2017 10:50:54 +0100
Subject: [PATCH 069/322] Refactor format_json userscript to not parse 'ls'
 output

The script now also works under MacOS
---
 misc/userscripts/format_json | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/misc/userscripts/format_json b/misc/userscripts/format_json
index 10ff23e53..0d476b327 100755
--- a/misc/userscripts/format_json
+++ b/misc/userscripts/format_json
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -euo pipefail
 #
 # Behavior:
 #   Userscript for qutebrowser which will take the raw JSON text of the current
@@ -19,28 +20,23 @@
 #
 # Bryan Gilbert, 2017
 
+# do not run pygmentize on files larger than this amount of bytes
+MAX_SIZE_PRETTIFY=10485760  # 10 MB
 # default style to monokai if none is provided
 STYLE=${1:-monokai}
-# format json using jq
-if ! FORMATTED_JSON="$(jq . "$QUTE_TEXT")" ||  [ -z "$FORMATTED_JSON" ]; then
-    echo "Invalid json, aborting..."
-    exit 1
+
+TEMP_FILE="$(mktemp)"
+jq . "$QUTE_TEXT" >"$TEMP_FILE"
+
+# try GNU stat first and then OSX stat if the former fails
+FILE_SIZE=$(
+  stat --printf="%s" "$TEMP_FILE" 2>/dev/null ||
+  stat -f%z "$TEMP_FILE" 2>/dev/null
+)
+if [ "$FILE_SIZE" -lt "$MAX_SIZE_PRETTIFY" ]; then
+    pygmentize -l json -f html -O full,style="$STYLE" <"$TEMP_FILE" >"${TEMP_FILE}_"
+    mv -f "${TEMP_FILE}_" "$TEMP_FILE"
 fi
 
-# calculate the filesize of the json document
-# parsing the output of ls should be fine in this case since we set the block size
-# shellcheck disable=SC2012
-FILE_SIZE=$(ls -s --block-size=1048576 "$QUTE_TEXT" | cut -d' ' -f1)
-
-# use pygments to pretty-up the json (syntax highlight) if file is less than 10MB
-if [ "$FILE_SIZE" -lt "10" ]; then
-    FORMATTED_JSON="$(echo "$FORMATTED_JSON" | pygmentize -l json -f html -O full,style="$STYLE")"
-fi
-
-# create a temp file and write the formatted json to that file
-TEMP_FILE="$(mktemp --suffix '.html')"
-echo "$FORMATTED_JSON" > "$TEMP_FILE"
-
-
 # send the command to qutebrowser to open the new file containing the formatted json
 echo "open -t file://$TEMP_FILE" >> "$QUTE_FIFO"

From 59c9a2b243204f4600018c12ccdad3fa40404071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Chavant?= <github@mail.chavant.info>
Date: Sun, 3 Dec 2017 11:30:59 +0100
Subject: [PATCH 070/322] Ignore shellcheck false positive

---
 scripts/dev/ci/travis_run.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/dev/ci/travis_run.sh b/scripts/dev/ci/travis_run.sh
index f4960b808..74b8ae63f 100644
--- a/scripts/dev/ci/travis_run.sh
+++ b/scripts/dev/ci/travis_run.sh
@@ -16,6 +16,8 @@ elif [[ $TESTENV == eslint ]]; then
     eslint --color --report-unused-disable-directives .
 elif [[ $TESTENV == shellcheck ]]; then
     dev_scripts=$( find scripts/dev/ -name '*.sh' -print0 | xargs -0 )
+    # false positive: we are using 'find -exec +'
+    # shellcheck disable=SC2038
     userscripts=$( find misc/userscripts/ -type f -exec grep -lE '[/ ][bd]ash$|[/ ]sh$|[/ ]ksh$' {} + | xargs )
     IFS=" " read -r -a scripts <<< "$dev_scripts $userscripts"
     docker run \

From f07301cfb5f31e02b26e1865a8d71389f002c0d2 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 3 Dec 2017 12:48:29 +0100
Subject: [PATCH 071/322] Revert "Restart correctly after reporting crash."

This reverts commit 7001f068b3ef29dce63feab19ee008d8c7e5ca27.
---
 qutebrowser/misc/crashdialog.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/misc/crashdialog.py b/qutebrowser/misc/crashdialog.py
index 3d50e5f29..9919386c4 100644
--- a/qutebrowser/misc/crashdialog.py
+++ b/qutebrowser/misc/crashdialog.py
@@ -348,7 +348,7 @@ class _CrashDialog(QDialog):
                          "but you're currently running v{} - please "
                          "update!".format(newest, qutebrowser.__version__))
         text = '<br/><br/>'.join(lines)
-        self.finish()
+        self.hide()
         msgbox.information(self, "Report successfully sent!", text,
                            on_finished=self.finish, plain_text=False)
 
@@ -365,7 +365,7 @@ class _CrashDialog(QDialog):
                      "<a href=https://www.qutebrowser.org/>qutebrowser.org</a> "
                      "by yourself.".format(msg))
         text = '<br/><br/>'.join(lines)
-        self.finish()
+        self.hide()
         msgbox.information(self, "Report successfully sent!", text,
                            on_finished=self.finish, plain_text=False)
 

From 97054ca35de48294ff549b82d2d586bd7c7b28ce Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 3 Dec 2017 13:04:08 +0100
Subject: [PATCH 072/322] Don't hide report dialog early

It looks like hiding it already causes it to be accepted.
Fixes #1128
---
 qutebrowser/misc/crashdialog.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/qutebrowser/misc/crashdialog.py b/qutebrowser/misc/crashdialog.py
index 9919386c4..54827211a 100644
--- a/qutebrowser/misc/crashdialog.py
+++ b/qutebrowser/misc/crashdialog.py
@@ -348,7 +348,6 @@ class _CrashDialog(QDialog):
                          "but you're currently running v{} - please "
                          "update!".format(newest, qutebrowser.__version__))
         text = '<br/><br/>'.join(lines)
-        self.hide()
         msgbox.information(self, "Report successfully sent!", text,
                            on_finished=self.finish, plain_text=False)
 
@@ -365,7 +364,6 @@ class _CrashDialog(QDialog):
                      "<a href=https://www.qutebrowser.org/>qutebrowser.org</a> "
                      "by yourself.".format(msg))
         text = '<br/><br/>'.join(lines)
-        self.hide()
         msgbox.information(self, "Report successfully sent!", text,
                            on_finished=self.finish, plain_text=False)
 

From b610563e7fed16f6403925fb5d17eb2f9f9a70a7 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sun, 3 Dec 2017 07:32:55 -0500
Subject: [PATCH 073/322] Don't show current window for :tab-give/:tab-take.

Resolves #3144.
---
 qutebrowser/browser/commands.py             |  2 +-
 qutebrowser/completion/completer.py         |  8 +++--
 qutebrowser/completion/models/miscmodels.py | 30 +++++++++++++++---
 qutebrowser/mainwindow/mainwindow.py        |  2 +-
 tests/unit/completion/test_completer.py     |  2 +-
 tests/unit/completion/test_models.py        | 35 ++++++++++++++++++---
 6 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 0de903004..bced4daf4 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -518,7 +518,7 @@ class CommandDispatcher:
         return newtab
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
-    @cmdutils.argument('index', completion=miscmodels.buffer)
+    @cmdutils.argument('index', completion=miscmodels.other_buffer)
     def tab_take(self, index):
         """Take a tab from another window.
 
diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py
index bc0e4991f..15c5d7f14 100644
--- a/qutebrowser/completion/completer.py
+++ b/qutebrowser/completion/completer.py
@@ -35,6 +35,7 @@ class CompletionInfo:
 
     config = attr.ib()
     keyconf = attr.ib()
+    win_id = attr.ib()
 
 
 class Completer(QObject):
@@ -43,6 +44,7 @@ class Completer(QObject):
 
     Attributes:
         _cmd: The statusbar Command object this completer belongs to.
+        _win_id: The id of the window that owns this object.
         _timer: The timer used to trigger the completion update.
         _last_cursor_pos: The old cursor position so we avoid double completion
                           updates.
@@ -50,9 +52,10 @@ class Completer(QObject):
         _last_completion_func: The completion function used for the last text.
     """
 
-    def __init__(self, cmd, parent=None):
+    def __init__(self, cmd, win_id, parent=None):
         super().__init__(parent)
         self._cmd = cmd
+        self._win_id = win_id
         self._timer = QTimer()
         self._timer.setSingleShot(True)
         self._timer.setInterval(0)
@@ -250,7 +253,8 @@ class Completer(QObject):
             with debug.log_time(log.completion,
                     'Starting {} completion'.format(func.__name__)):
                 info = CompletionInfo(config=config.instance,
-                                      keyconf=config.key_instance)
+                                      keyconf=config.key_instance,
+                                      win_id=self._win_id)
                 model = func(*args, info=info)
             with debug.log_time(log.completion, 'Set completion model'):
                 completion.set_model(model)
diff --git a/qutebrowser/completion/models/miscmodels.py b/qutebrowser/completion/models/miscmodels.py
index 28ff0ddac..6175dcfb4 100644
--- a/qutebrowser/completion/models/miscmodels.py
+++ b/qutebrowser/completion/models/miscmodels.py
@@ -94,10 +94,10 @@ def session(*, info=None):  # pylint: disable=unused-argument
     return model
 
 
-def buffer(*, info=None):  # pylint: disable=unused-argument
-    """A model to complete on open tabs across all windows.
-
-    Used for switching the buffer command.
+def _buffer(skip_win_id=None):
+    """Helper to get the completion model for buffer/other_buffer.
+    Args:
+        skip_win_id: The id of the window to skip, or None to include all.
     """
     def delete_buffer(data):
         """Close the selected tab."""
@@ -109,6 +109,8 @@ def buffer(*, info=None):  # pylint: disable=unused-argument
     model = completionmodel.CompletionModel(column_widths=(6, 40, 54))
 
     for win_id in objreg.window_registry:
+        if skip_win_id and win_id == skip_win_id:
+            continue
         tabbed_browser = objreg.get('tabbed-browser', scope='window',
                                     window=win_id)
         if tabbed_browser.shutting_down:
@@ -126,13 +128,31 @@ def buffer(*, info=None):  # pylint: disable=unused-argument
     return model
 
 
-def window(*, info=None):  # pylint: disable=unused-argument
+def buffer(*, info=None):  # pylint: disable=unused-argument
+    """A model to complete on open tabs across all windows.
+
+    Used for switching the buffer command.
+    """
+    return _buffer()
+
+
+def other_buffer(*, info):
+    """A model to complete on open tabs across all windows except the current.
+
+    Used for the tab-take command.
+    """
+    return _buffer(skip_win_id=info.win_id)
+
+
+def window(*, info):
     """A model to complete on all open windows."""
     model = completionmodel.CompletionModel(column_widths=(6, 30, 64))
 
     windows = []
 
     for win_id in objreg.window_registry:
+        if win_id == info.win_id:
+            continue
         tabbed_browser = objreg.get('tabbed-browser', scope='window',
                                     window=win_id)
         tab_titles = (tab.title() for tab in tabbed_browser.widgets())
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index bf95d3e6a..5acec2384 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -320,7 +320,7 @@ class MainWindow(QWidget):
     def _init_completion(self):
         self._completion = completionwidget.CompletionView(self.win_id, self)
         cmd = objreg.get('status-command', scope='window', window=self.win_id)
-        completer_obj = completer.Completer(cmd, self._completion)
+        completer_obj = completer.Completer(cmd, self.win_id, self._completion)
         self._completion.selection_changed.connect(
             completer_obj.on_selection_changed)
         objreg.register('completion', self._completion, scope='window',
diff --git a/tests/unit/completion/test_completer.py b/tests/unit/completion/test_completer.py
index a32241621..0e8aabb93 100644
--- a/tests/unit/completion/test_completer.py
+++ b/tests/unit/completion/test_completer.py
@@ -65,7 +65,7 @@ def completer_obj(qtbot, status_command_stub, config_stub, monkeypatch, stubs,
     """Create the completer used for testing."""
     monkeypatch.setattr(completer, 'QTimer', stubs.InstaTimer)
     config_stub.val.completion.show = 'auto'
-    return completer.Completer(status_command_stub, completion_widget_stub)
+    return completer.Completer(status_command_stub, 0, completion_widget_stub)
 
 
 @pytest.fixture(autouse=True)
diff --git a/tests/unit/completion/test_models.py b/tests/unit/completion/test_models.py
index 9c767c102..8879f3201 100644
--- a/tests/unit/completion/test_models.py
+++ b/tests/unit/completion/test_models.py
@@ -191,7 +191,8 @@ def web_history_populated(web_history):
 @pytest.fixture
 def info(config_stub, key_config_stub):
     return completer.CompletionInfo(config=config_stub,
-                                    keyconf=key_config_stub)
+                                    keyconf=key_config_stub,
+                                    win_id=0)
 
 
 def test_command_completion(qtmodeltester, cmdutils_stub, configdata_stub,
@@ -581,7 +582,33 @@ def test_tab_completion_delete(qtmodeltester, fake_web_tab, app_stub,
                       QUrl('https://duckduckgo.com')]
 
 
-def test_window_completion(qtmodeltester, fake_web_tab, tabbed_browser_stubs):
+def test_other_buffer_completion(qtmodeltester, fake_web_tab, app_stub,
+                                 win_registry, tabbed_browser_stubs, info):
+    tabbed_browser_stubs[0].tabs = [
+        fake_web_tab(QUrl('https://github.com'), 'GitHub', 0),
+        fake_web_tab(QUrl('https://wikipedia.org'), 'Wikipedia', 1),
+        fake_web_tab(QUrl('https://duckduckgo.com'), 'DuckDuckGo', 2),
+    ]
+    tabbed_browser_stubs[1].tabs = [
+        fake_web_tab(QUrl('https://wiki.archlinux.org'), 'ArchWiki', 0),
+    ]
+    info.win_id = 1
+    model = miscmodels.other_buffer(info=info)
+    model.set_pattern('')
+    qtmodeltester.data_display_may_return_none = True
+    qtmodeltester.check(model)
+
+    _check_completions(model, {
+        '0': [
+            ('0/1', 'https://github.com', 'GitHub'),
+            ('0/2', 'https://wikipedia.org', 'Wikipedia'),
+            ('0/3', 'https://duckduckgo.com', 'DuckDuckGo')
+        ],
+    })
+
+
+def test_window_completion(qtmodeltester, fake_web_tab, tabbed_browser_stubs,
+                           info):
     tabbed_browser_stubs[0].tabs = [
         fake_web_tab(QUrl('https://github.com'), 'GitHub', 0),
         fake_web_tab(QUrl('https://wikipedia.org'), 'Wikipedia', 1),
@@ -591,7 +618,8 @@ def test_window_completion(qtmodeltester, fake_web_tab, tabbed_browser_stubs):
         fake_web_tab(QUrl('https://wiki.archlinux.org'), 'ArchWiki', 0)
     ]
 
-    model = miscmodels.window()
+    info.win_id = 1
+    model = miscmodels.window(info=info)
     model.set_pattern('')
     qtmodeltester.data_display_may_return_none = True
     qtmodeltester.check(model)
@@ -600,7 +628,6 @@ def test_window_completion(qtmodeltester, fake_web_tab, tabbed_browser_stubs):
         'Windows': [
             ('0', 'window title - qutebrowser',
                 'GitHub, Wikipedia, DuckDuckGo'),
-            ('1', 'window title - qutebrowser', 'ArchWiki')
         ]
     })
 

From 38b2d42b4019d31febf298667041c6bbf6e6cd9e Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Sun, 3 Dec 2017 15:09:47 -0600
Subject: [PATCH 074/322] cleanup PYTEST_ADDOPTS for pytest subprocess

See https://github.com/qutebrowser/qutebrowser/pull/3349
---
 tests/unit/scripts/test_check_coverage.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/scripts/test_check_coverage.py b/tests/unit/scripts/test_check_coverage.py
index 6b18568c5..d7183111f 100644
--- a/tests/unit/scripts/test_check_coverage.py
+++ b/tests/unit/scripts/test_check_coverage.py
@@ -50,6 +50,7 @@ class CovtestHelper:
     def run(self):
         """Run pytest with coverage for the given module.py."""
         coveragerc = str(self._testdir.tmpdir / 'coveragerc')
+        self._monkeypatch.delenv('PYTEST_ADDOPTS', raising=False)
         return self._testdir.runpytest('--cov=module',
                                        '--cov-config={}'.format(coveragerc),
                                        '--cov-report=xml',

From a137a29ccea17fa0228e339182b656ed63090e27 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 3 Dec 2017 22:32:17 +0100
Subject: [PATCH 075/322] Style improvements

This adds a blank line and makes Completer arguments keyword-only to make their
meaning more clear.
---
 qutebrowser/completion/completer.py         | 2 +-
 qutebrowser/completion/models/miscmodels.py | 1 +
 qutebrowser/mainwindow/mainwindow.py        | 3 ++-
 tests/unit/completion/test_completer.py     | 3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py
index 15c5d7f14..edb1aca97 100644
--- a/qutebrowser/completion/completer.py
+++ b/qutebrowser/completion/completer.py
@@ -52,7 +52,7 @@ class Completer(QObject):
         _last_completion_func: The completion function used for the last text.
     """
 
-    def __init__(self, cmd, win_id, parent=None):
+    def __init__(self, *, cmd, win_id, parent=None):
         super().__init__(parent)
         self._cmd = cmd
         self._win_id = win_id
diff --git a/qutebrowser/completion/models/miscmodels.py b/qutebrowser/completion/models/miscmodels.py
index 6175dcfb4..b1e599798 100644
--- a/qutebrowser/completion/models/miscmodels.py
+++ b/qutebrowser/completion/models/miscmodels.py
@@ -96,6 +96,7 @@ def session(*, info=None):  # pylint: disable=unused-argument
 
 def _buffer(skip_win_id=None):
     """Helper to get the completion model for buffer/other_buffer.
+
     Args:
         skip_win_id: The id of the window to skip, or None to include all.
     """
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 5acec2384..7c35f0529 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -320,7 +320,8 @@ class MainWindow(QWidget):
     def _init_completion(self):
         self._completion = completionwidget.CompletionView(self.win_id, self)
         cmd = objreg.get('status-command', scope='window', window=self.win_id)
-        completer_obj = completer.Completer(cmd, self.win_id, self._completion)
+        completer_obj = completer.Completer(cmd=cmd, win_id=self.win_id,
+                                            parent=self._completion)
         self._completion.selection_changed.connect(
             completer_obj.on_selection_changed)
         objreg.register('completion', self._completion, scope='window',
diff --git a/tests/unit/completion/test_completer.py b/tests/unit/completion/test_completer.py
index 0e8aabb93..012122937 100644
--- a/tests/unit/completion/test_completer.py
+++ b/tests/unit/completion/test_completer.py
@@ -65,7 +65,8 @@ def completer_obj(qtbot, status_command_stub, config_stub, monkeypatch, stubs,
     """Create the completer used for testing."""
     monkeypatch.setattr(completer, 'QTimer', stubs.InstaTimer)
     config_stub.val.completion.show = 'auto'
-    return completer.Completer(status_command_stub, 0, completion_widget_stub)
+    return completer.Completer(cmd=status_command_stub, win_id=0,
+                               parent=completion_widget_stub)
 
 
 @pytest.fixture(autouse=True)

From 6b65d96fe101517592820f6e9b0efa64d575a294 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 4 Dec 2017 06:32:54 +0100
Subject: [PATCH 076/322] Reformat comment

---
 scripts/link_pyqt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/link_pyqt.py b/scripts/link_pyqt.py
index 82f8cbac5..ad7d45383 100644
--- a/scripts/link_pyqt.py
+++ b/scripts/link_pyqt.py
@@ -205,7 +205,7 @@ def main():
     args = parser.parse_args()
 
     if args.tox:
-        #workaround for the lack of negative factors in tox.ini
+        # Workaround for the lack of negative factors in tox.ini
         if 'LINK_PYQT_SKIP' in os.environ:
             print('LINK_PYQT_SKIP set, exiting...')
             sys.exit(0)

From 2c2d7fe7349cfef6272e3db9d1a9a52878bde88b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 4 Dec 2017 06:36:42 +0100
Subject: [PATCH 077/322] Copy-paste pylint commands for second environment

Otherwise, tox 2.3.1 (shipped with various distributions) fails with:

    tox.ConfigError: ConfigError: substitution key 'posargs' not found
---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 2ada5ab58..a45e04c79 100644
--- a/tox.ini
+++ b/tox.ini
@@ -133,7 +133,8 @@ deps =
     -r{toxinidir}/misc/requirements/requirements-pylint.txt
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
-    {[testenv:pylint]commands}
+    {envpython} -m pylint scripts qutebrowser --output-format=colorized --reports=no {posargs}
+    {envpython} scripts/dev/run_pylint_on_tests.py {toxinidir} --output-format=colorized --reports=no {posargs}
 
 [testenv:pylint-master]
 basepython = python3

From 7ef64c0f87adecb51017327832e17ef64ea1049e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 4 Dec 2017 06:45:47 +0100
Subject: [PATCH 078/322] Read $PYTHON in every tox.ini environment

See #2341
---
 doc/install.asciidoc |  4 ++--
 tox.ini              | 39 ++++++++++-----------------------------
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/doc/install.asciidoc b/doc/install.asciidoc
index 1dba5fa57..15718ec41 100644
--- a/doc/install.asciidoc
+++ b/doc/install.asciidoc
@@ -379,8 +379,8 @@ local Qt install instead of installing PyQt in the virtualenv. However, unless
 you have a new QtWebKit or QtWebEngine available, qutebrowser will not work. It
 also typically means you'll be using an older release of QtWebEngine.
 
-On Windows, run `tox -e 'mkvenv-win' instead, however make sure that ONLY
-Python3 is in your PATH before running tox.
+On Windows, run `set PYTHON=C:\path\to\python.exe` (CMD) or ``$Env:PYTHON =
+"..."` (Powershell) first.
 
 Creating a wrapper script
 ~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tox.ini b/tox.ini
index a45e04c79..e59e8b660 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,16 +35,7 @@ commands =
 # other envs
 
 [testenv:mkvenv]
-basepython = python3
-commands = {envpython} scripts/link_pyqt.py --tox {envdir}
-envdir = {toxinidir}/.venv
-usedevelop = true
-deps =
-    -r{toxinidir}/requirements.txt
-
-# This is used for Windows, since binary name is different
-[testenv:mkvenv-win]
-basepython = python.exe
+basepython = {env:PYTHON:python3}
 commands = {envpython} scripts/link_pyqt.py --tox {envdir}
 envdir = {toxinidir}/.venv
 usedevelop = true
@@ -61,7 +52,7 @@ deps = {[testenv:mkvenv]deps}
 
 # Virtualenv with PyQt5 from PyPI
 [testenv:mkvenv-pypi]
-basepython = python3
+basepython = {env:PYTHON:python3}
 envdir = {toxinidir}/.venv
 commands = {envpython} -c ""
 usedevelop = true
@@ -69,19 +60,9 @@ deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-pyqt.txt
 
-# This is used for Windows, since binary name is different
-[testenv:mkvenv-win-pypi]
-basepython = python.exe
-commands = {envpython} -c ""
-envdir = {toxinidir}/.venv
-usedevelop = true
-deps =
-    -r{toxinidir}/requirements.txt
-    -r{toxinidir}/misc/requirements/requirements-pyqt.txt
-
 [testenv:misc]
 ignore_errors = true
-basepython = python3
+basepython = {env:PYTHON:python3}
 # For global .gitignore files
 passenv = HOME
 deps =
@@ -91,7 +72,7 @@ commands =
     {envpython} scripts/dev/misc_checks.py spelling
 
 [testenv:vulture]
-basepython = python3
+basepython = {env:PYTHON:python3}
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-vulture.txt
@@ -101,7 +82,7 @@ commands =
     {envpython} scripts/dev/run_vulture.py
 
 [testenv:vulture-pyqtlink]
-basepython = python3
+basepython = {env:PYTHON:python3}
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-vulture.txt
@@ -137,7 +118,7 @@ commands =
     {envpython} scripts/dev/run_pylint_on_tests.py {toxinidir} --output-format=colorized --reports=no {posargs}
 
 [testenv:pylint-master]
-basepython = python3
+basepython = {env:PYTHON:python3}
 passenv = {[testenv:pylint]passenv}
 deps =
     -r{toxinidir}/requirements.txt
@@ -149,7 +130,7 @@ commands =
     {envpython} scripts/dev/run_pylint_on_tests.py --output-format=colorized --reports=no {posargs}
 
 [testenv:flake8]
-basepython = python3
+basepython = {env:PYTHON:python3}
 passenv =
 deps =
     -r{toxinidir}/requirements.txt
@@ -158,7 +139,7 @@ commands =
     {envpython} -m flake8 {posargs:qutebrowser tests scripts}
 
 [testenv:pyroma]
-basepython = python3
+basepython = {env:PYTHON:python3}
 passenv =
 deps =
     -r{toxinidir}/misc/requirements/requirements-pyroma.txt
@@ -166,7 +147,7 @@ commands =
     {envdir}/bin/pyroma .
 
 [testenv:check-manifest]
-basepython = python3
+basepython = {env:PYTHON:python3}
 passenv =
 deps =
      -r{toxinidir}/misc/requirements/requirements-check-manifest.txt
@@ -174,7 +155,7 @@ commands =
     {envdir}/bin/check-manifest --ignore 'qutebrowser/git-commit-id,qutebrowser/html/doc,qutebrowser/html/doc/*,*/__pycache__'
 
 [testenv:docs]
-basepython = python3
+basepython = {env:PYTHON:python3}
 whitelist_externals = git
 passenv = TRAVIS TRAVIS_PULL_REQUEST
 deps =

From a3f57b9a9b32ec64acc1307e410fd5f274e998fb Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 4 Dec 2017 16:09:14 +0100
Subject: [PATCH 079/322] Update flake8-builtins from 1.0 to 1.0.post0

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index a031778ba..37ceb7f31 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -3,7 +3,7 @@
 attrs==17.3.0
 flake8==3.5.0
 flake8-bugbear==17.4.0
-flake8-builtins==1.0
+flake8-builtins==1.0.post0
 flake8-comprehensions==1.4.1
 flake8-copyright==0.2.0
 flake8-debugger==3.0.0

From 905748f2d0fef6dd503b0eba1bd3b3fa598a3fc6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 4 Dec 2017 16:09:16 +0100
Subject: [PATCH 080/322] Update setuptools from 38.2.1 to 38.2.3

---
 misc/requirements/requirements-pip.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt
index 4f4b0986c..8ca5a867e 100644
--- a/misc/requirements/requirements-pip.txt
+++ b/misc/requirements/requirements-pip.txt
@@ -3,6 +3,6 @@
 appdirs==1.4.3
 packaging==16.8
 pyparsing==2.2.0
-setuptools==38.2.1
+setuptools==38.2.3
 six==1.11.0
 wheel==0.30.0

From a3612a624a651147af6ac9cb98dc45498589146e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 4 Dec 2017 16:09:17 +0100
Subject: [PATCH 081/322] Update altgraph from 0.14 to 0.15

---
 misc/requirements/requirements-pyinstaller.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt
index e542e4243..b2803311f 100644
--- a/misc/requirements/requirements-pyinstaller.txt
+++ b/misc/requirements/requirements-pyinstaller.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-altgraph==0.14
+altgraph==0.15
 future==0.16.0
 macholib==1.8
 pefile==2017.11.5

From 96b6f7c4434c3070e7d4ffc36138d37c502e37a0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 4 Dec 2017 16:09:19 +0100
Subject: [PATCH 082/322] Update macholib from 1.8 to 1.9

---
 misc/requirements/requirements-pyinstaller.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt
index b2803311f..f65e8c62a 100644
--- a/misc/requirements/requirements-pyinstaller.txt
+++ b/misc/requirements/requirements-pyinstaller.txt
@@ -2,6 +2,6 @@
 
 altgraph==0.15
 future==0.16.0
-macholib==1.8
+macholib==1.9
 pefile==2017.11.5
 -e git+https://github.com/pyinstaller/pyinstaller.git@develop#egg=PyInstaller

From f7ccb8061b7acb00b68a19d625129c34c3c0bee1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 4 Dec 2017 16:09:20 +0100
Subject: [PATCH 083/322] Update pyroma from 2.2 to 2.3

---
 misc/requirements/requirements-pyroma.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pyroma.txt b/misc/requirements/requirements-pyroma.txt
index d6ed0c190..241273169 100644
--- a/misc/requirements/requirements-pyroma.txt
+++ b/misc/requirements/requirements-pyroma.txt
@@ -1,4 +1,4 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 docutils==0.14
-pyroma==2.2
+pyroma==2.3

From a0caa2b7b1161126b0f81e83d7350714ce1a3edd Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 4 Dec 2017 16:09:22 +0100
Subject: [PATCH 084/322] Update hypothesis from 3.38.5 to 3.40.1

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 358dd72a6..a359d0662 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -11,7 +11,7 @@ fields==5.0.0
 Flask==0.12.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.38.5
+hypothesis==3.40.1
 itsdangerous==0.24
 # Jinja2==2.9.6
 Mako==1.0.7

From 71095da975e37c91f44170630b213161bd076930 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 4 Dec 2017 16:09:23 +0100
Subject: [PATCH 085/322] Update pytest from 3.2.5 to 3.3.0

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index a359d0662..cd00dd3e9 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -20,7 +20,7 @@ parse==1.8.2
 parse-type==0.4.2
 py==1.5.2
 py-cpuinfo==3.3.0
-pytest==3.2.5
+pytest==3.3.0
 pytest-bdd==2.19.0
 pytest-benchmark==3.1.1
 pytest-catchlog==1.2.2

From 956c257d196a251cb3f303908dfbebf3affda465 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 4 Dec 2017 16:09:25 +0100
Subject: [PATCH 086/322] Update pytest-travis-fold from 1.2.0 to 1.3.0

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index cd00dd3e9..37fd891db 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -31,7 +31,7 @@ pytest-mock==1.6.3
 pytest-qt==2.3.0
 pytest-repeat==0.4.1
 pytest-rerunfailures==3.1
-pytest-travis-fold==1.2.0
+pytest-travis-fold==1.3.0
 pytest-xvfb==1.0.0
 PyVirtualDisplay==0.2.1
 six==1.11.0

From 2cdc32ca5840b4f4804c97ef1ff6c85053f10714 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 4 Dec 2017 16:55:57 +0100
Subject: [PATCH 087/322] Remove pytest-catchlog

---
 misc/requirements/requirements-tests-git.txt |  6 ------
 misc/requirements/requirements-tests.txt     |  1 -
 misc/requirements/requirements-tests.txt-raw |  1 -
 tests/helpers/logfail.py                     | 17 ++++-----------
 tests/helpers/test_logfail.py                | 22 --------------------
 tests/unit/utils/test_log.py                 |  6 +++---
 6 files changed, 7 insertions(+), 46 deletions(-)

diff --git a/misc/requirements/requirements-tests-git.txt b/misc/requirements/requirements-tests-git.txt
index 6b31140bb..6681dd15e 100644
--- a/misc/requirements/requirements-tests-git.txt
+++ b/misc/requirements/requirements-tests-git.txt
@@ -12,12 +12,6 @@ git+https://github.com/jenisys/parse_type.git
 hg+https://bitbucket.org/pytest-dev/py
 git+https://github.com/pytest-dev/pytest.git@features
 git+https://github.com/pytest-dev/pytest-bdd.git
-
-# This is broken at the moment because logfail tries to access
-# LogCaptureHandler
-# git+https://github.com/eisensheng/pytest-catchlog.git
-pytest-catchlog==1.2.2
-
 git+https://github.com/pytest-dev/pytest-cov.git
 git+https://github.com/pytest-dev/pytest-faulthandler.git
 git+https://github.com/pytest-dev/pytest-instafail.git
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 37fd891db..58644a500 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -23,7 +23,6 @@ py-cpuinfo==3.3.0
 pytest==3.3.0
 pytest-bdd==2.19.0
 pytest-benchmark==3.1.1
-pytest-catchlog==1.2.2
 pytest-cov==2.5.1
 pytest-faulthandler==1.3.1
 pytest-instafail==0.3.0
diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw
index bc44bc8e1..121689980 100644
--- a/misc/requirements/requirements-tests.txt-raw
+++ b/misc/requirements/requirements-tests.txt-raw
@@ -7,7 +7,6 @@ hypothesis
 pytest
 pytest-bdd
 pytest-benchmark
-pytest-catchlog
 pytest-cov
 pytest-faulthandler
 pytest-instafail
diff --git a/tests/helpers/logfail.py b/tests/helpers/logfail.py
index 3d8e3afb8..ba7ed24b8 100644
--- a/tests/helpers/logfail.py
+++ b/tests/helpers/logfail.py
@@ -22,16 +22,7 @@
 import logging
 
 import pytest
-
-try:
-    import pytest_catchlog as catchlog_mod
-except ImportError:
-    # When using pytest for pyflakes/pep8/..., the plugin won't be available
-    # but conftest.py will still be loaded.
-    #
-    # However, LogFailHandler.emit will never be used in that case, so we just
-    # ignore the ImportError.
-    pass
+import _pytest.logging
 
 
 class LogFailHandler(logging.Handler):
@@ -50,8 +41,8 @@ class LogFailHandler(logging.Handler):
             return
 
         for h in root_logger.handlers:
-            if isinstance(h, catchlog_mod.LogCaptureHandler):
-                catchlog_handler = h
+            if isinstance(h, _pytest.logging.LogCaptureHandler):
+                capture_handler = h
                 break
         else:
             # The LogCaptureHandler is not available anymore during fixture
@@ -59,7 +50,7 @@ class LogFailHandler(logging.Handler):
             return
 
         if (logger.level == record.levelno or
-                catchlog_handler.level == record.levelno):
+                capture_handler.level == record.levelno):
             # caplog.at_level(...) was used with the level of this message,
             # i.e.  it was expected.
             return
diff --git a/tests/helpers/test_logfail.py b/tests/helpers/test_logfail.py
index b95dec1d6..48aaaa201 100644
--- a/tests/helpers/test_logfail.py
+++ b/tests/helpers/test_logfail.py
@@ -23,7 +23,6 @@
 import logging
 
 import pytest
-import pytest_catchlog
 
 
 def test_log_debug():
@@ -64,24 +63,3 @@ def test_log_expected_wrong_logger(caplog):
     with pytest.raises(pytest.fail.Exception):
         with caplog.at_level(logging.ERROR, logger):
             logging.error('foo')
-
-
-@pytest.fixture
-def skipping_fixture():
-    pytest.skip("Skipping to test caplog workaround.")
-
-
-def test_caplog_bug_workaround_1(caplog, skipping_fixture):
-    pass
-
-
-def test_caplog_bug_workaround_2():
-    """Make sure caplog_bug_workaround works correctly after a skipped test.
-
-    There should be only one capturelog handler.
-    """
-    caplog_handler = None
-    for h in logging.getLogger().handlers:
-        if isinstance(h, pytest_catchlog.LogCaptureHandler):
-            assert caplog_handler is None
-            caplog_handler = h
diff --git a/tests/unit/utils/test_log.py b/tests/unit/utils/test_log.py
index 30dd5d634..2ab51002d 100644
--- a/tests/unit/utils/test_log.py
+++ b/tests/unit/utils/test_log.py
@@ -27,7 +27,7 @@ import warnings
 
 import attr
 import pytest
-import pytest_catchlog
+import _pytest.logging
 
 from qutebrowser.utils import log
 from qutebrowser.misc import utilcmds
@@ -66,11 +66,11 @@ def restore_loggers():
     while root_logger.handlers:
         h = root_logger.handlers[0]
         root_logger.removeHandler(h)
-        if not isinstance(h, pytest_catchlog.LogCaptureHandler):
+        if not isinstance(h, _pytest.logging.LogCaptureHandler):
             h.close()
     root_logger.setLevel(original_logging_level)
     for h in root_handlers:
-        if not isinstance(h, pytest_catchlog.LogCaptureHandler):
+        if not isinstance(h, _pytest.logging.LogCaptureHandler):
             # https://github.com/qutebrowser/qutebrowser/issues/856
             root_logger.addHandler(h)
     logging._acquireLock()

From 6973a703c54783b774079bab40f4d75e64262e17 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 4 Dec 2017 16:56:39 +0100
Subject: [PATCH 088/322] Add pluggy to requirements

---
 misc/requirements/requirements-tests.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 58644a500..119891725 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -18,6 +18,7 @@ Mako==1.0.7
 # MarkupSafe==1.0
 parse==1.8.2
 parse-type==0.4.2
+pluggy==0.6.0
 py==1.5.2
 py-cpuinfo==3.3.0
 pytest==3.3.0

From b6466b74108d5087f3b5659d75dd4ab0e0e1ac93 Mon Sep 17 00:00:00 2001
From: Josefson Fraga <josefson@users.noreply.github.com>
Date: Mon, 4 Dec 2017 13:08:56 -0300
Subject: [PATCH 089/322] revision 2

---
 scripts/hist_importer.py | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index 79c723c58..36f151e6f 100755
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -2,7 +2,7 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 # Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-# Copyright 2014-2017 Josefson Souza <josefson.br@gmail.com>
+# Copyright 2017 Josefson Souza <josefson.br@gmail.com>
 
 # This file is part of qutebrowser.
 #
@@ -32,17 +32,17 @@ import os
 def parse():
     """Parse command line arguments."""
     description = ("This program is meant to extract browser history from your"
-                   "previous browser and import them into qutebrowser.")
-    epilog = ("Databases:\n\tQutebrowser: Is named 'history.sqlite' and can be"
+                   " previous browser and import them into qutebrowser.")
+    epilog = ("Databases:\n\n\tqutebrowser: Is named 'history.sqlite' and can be"
               " found at your --basedir. In order to find where your basedir"
               " is you can run ':open qute:version' inside qutebrowser."
-              "\n\tFirerox: Is named 'places.sqlite', and can be found at your"
-              "system\"s profile folder. Check this link for where it is locat"
-              "ed: http://kb.mozillazine.org/Profile_folder"
-              "\n\tChrome: Is named 'History', and can be found at the respec"
-              "tive User Data Directory. Check this link for where it is locat"
-              "ed: https://chromium.googlesource.com/chromium/src/+/master/"
-              "docs/user_data_dir.md\n\n"
+              "\n\n\tFirefox: Is named 'places.sqlite', and can be found at your"
+              " system's profile folder. Check this link for where it is "
+              "located: http://kb.mozillazine.org/Profile_folder"
+              "\n\n\tChrome: Is named 'History', and can be found at the "
+              "respective User Data Directory. Check this link for where it is"
+              "located: https://chromium.googlesource.com/chromium/src/+/"
+              "master/docs/user_data_dir.md\n\n"
               "Example: hist_importer.py -b firefox -s /Firefox/Profile/"
               "places.sqlite -d /qutebrowser/data/history.sqlite")
     parser = argparse.ArgumentParser(
@@ -55,7 +55,7 @@ def parse():
                         type=str, help='Source: Full path to the sqlite data'
                         'base file from the source browser.')
     parser.add_argument('-d', '--dest', dest='dest', required=True, type=str,
-                        help='Destination: The full path to the qutebrowser '
+                        help='\nDestination: Full path to the qutebrowser '
                         'sqlite database')
     return parser.parse_args()
 
@@ -66,10 +66,9 @@ def open_db(data_base):
         conn = sqlite3.connect(data_base)
         return conn
     else:
-        raise sys.exit('\nDataBaseNotFound: There was some error trying to to'
+        raise sys.exit('DataBaseNotFound: There was some error trying to to'
                        ' connect with the [{}] database. Verify if the'
-                       ' filepath is correct or is being used.'
-                       .format(data_base))
+                       ' given file path is correct.'.format(data_base))
 
 
 def extract(source, query):
@@ -91,8 +90,7 @@ def extract(source, query):
         return history
     except sqlite3.OperationalError as op_e:
         print('\nCould not perform queries into the source database: {}'
-              '\nBrowser version is not supported as it have a different sql'
-              ' schema.'.format(op_e))
+              .format(op_e))
 
 
 def clean(history):

From 4467f51e42275b1662b6aab7d7de073a5b0e6b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Chavant?= <github@mail.chavant.info>
Date: Mon, 4 Dec 2017 18:15:02 +0100
Subject: [PATCH 090/322] Use 'language: generic' for shellcheck, fix typo,
 correct indentation

---
 .travis.yml                  | 1 +
 misc/userscripts/rss         | 4 ++--
 scripts/dev/ci/travis_run.sh | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 37387b620..0ea8218a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,6 +53,7 @@ matrix:
       python: null
       node_js: "lts/*"
     - os: linux
+      language: generic
       env: TESTENV=shellcheck
       services: docker
   fast_finish: true
diff --git a/misc/userscripts/rss b/misc/userscripts/rss
index 6680a259e..f8feebee7 100755
--- a/misc/userscripts/rss
+++ b/misc/userscripts/rss
@@ -57,7 +57,7 @@ notice () {
 
 # Update a database of a feed and open new URLs
 read_items () {
-    cd read_urls || return
+    cd read_urls || return 1
     feed_file="$(echo "$1" | tr -d /)"
     feed_temp_file="$(mktemp "$feed_file.tmp.XXXXXXXXXX")"
     feed_new_items="$(mktemp "$feed_file.new.XXXXXXXXXX")"
@@ -85,7 +85,7 @@ if [ ! -d "$config_dir/read_urls" ]; then
     mkdir -p "$config_dir/read_urls"
 fi
 
-cd "$config_dir" || exit
+cd "$config_dir" || exit 1
 
 if [ $# != 0 ]; then
     for arg in "$@"; do
diff --git a/scripts/dev/ci/travis_run.sh b/scripts/dev/ci/travis_run.sh
index 74b8ae63f..c0f59dc1a 100644
--- a/scripts/dev/ci/travis_run.sh
+++ b/scripts/dev/ci/travis_run.sh
@@ -22,7 +22,7 @@ elif [[ $TESTENV == shellcheck ]]; then
     IFS=" " read -r -a scripts <<< "$dev_scripts $userscripts"
     docker run \
            -v "$PWD:/outside" \
-	   -w /outside \
+           -w /outside \
            koalaman/shellcheck:latest "${scripts[@]}"
 else
     args=()

From 86c37538d71e2937386ae89089191018231c7998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Chavant?= <github@mail.chavant.info>
Date: Mon, 4 Dec 2017 18:29:55 +0100
Subject: [PATCH 091/322] Simply search for shell scripts to search

Use 2 simpler find commands and redirect the output to a temporary
file.
---
 scripts/dev/ci/travis_run.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/dev/ci/travis_run.sh b/scripts/dev/ci/travis_run.sh
index c0f59dc1a..b7d44968e 100644
--- a/scripts/dev/ci/travis_run.sh
+++ b/scripts/dev/ci/travis_run.sh
@@ -15,11 +15,11 @@ elif [[ $TESTENV == eslint ]]; then
     cd qutebrowser/javascript || exit 1
     eslint --color --report-unused-disable-directives .
 elif [[ $TESTENV == shellcheck ]]; then
-    dev_scripts=$( find scripts/dev/ -name '*.sh' -print0 | xargs -0 )
-    # false positive: we are using 'find -exec +'
-    # shellcheck disable=SC2038
-    userscripts=$( find misc/userscripts/ -type f -exec grep -lE '[/ ][bd]ash$|[/ ]sh$|[/ ]ksh$' {} + | xargs )
-    IFS=" " read -r -a scripts <<< "$dev_scripts $userscripts"
+    SCRIPTS=$( mktemp )
+    find scripts/dev/ -name '*.sh' >"$SCRIPTS"
+    find misc/userscripts/ -type f -exec grep -lE '[/ ][bd]ash$|[/ ]sh$|[/ ]ksh$' {} + >>"$SCRIPTS"
+    mapfile -t scripts <"$SCRIPTS"
+    rm -f "$SCRIPTS"
     docker run \
            -v "$PWD:/outside" \
            -w /outside \

From 3a04de62ae4a5dde8aabd4edcc7a7e584c113aae Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 4 Dec 2017 19:01:21 +0100
Subject: [PATCH 092/322] Recompile requirements

---
 misc/requirements/requirements-tests.txt | 2 +-
 misc/requirements/requirements-tox.txt   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 119891725..46905f497 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -13,7 +13,7 @@ glob2==0.6
 hunter==2.0.2
 hypothesis==3.40.1
 itsdangerous==0.24
-# Jinja2==2.9.6
+# Jinja2==2.10
 Mako==1.0.7
 # MarkupSafe==1.0
 parse==1.8.2
diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt
index 1308c8afd..d2b3a719b 100644
--- a/misc/requirements/requirements-tox.txt
+++ b/misc/requirements/requirements-tox.txt
@@ -2,5 +2,6 @@
 
 pluggy==0.6.0
 py==1.5.2
+six==1.11.0
 tox==2.9.1
 virtualenv==15.1.0

From 28caddf3c1700f77c78173b3677abd71c8d9582a Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Mon, 4 Dec 2017 19:02:09 +0100
Subject: [PATCH 093/322] delay added, text changed

---
 qutebrowser/html/back.html | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index b6190feda..cfaae589b 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -21,6 +21,15 @@ function go_forward() {
 	history.forward();
 }
 
+function prepare_restore() {
+	if (!document.hidden) {
+		go_back();
+		break;
+	}
+		
+	document.addEventListener("visibilitychange", go_back);
+}
+
 // there are three states
 // default: register focus listener,
 //	    on focus: go back and switch to the state forward
@@ -38,17 +47,14 @@ switch (history.state) {
 		go_forward();
 		break;
 	default:
-		if (!document.hidden) {
-			go_back();
-			break;
-		}
-		
-		document.addEventListener("visibilitychange", go_back);
+		setTimeout(prepare_restore, 1000);
 		break;
 }
 {% endblock %}
 
 {% block content %}
 <noscript><p>Javascript isn't enabled. So you need to manually go back in history to restore this tab.</p></noscript>
-<p>If you see this site something went wrong, or you reached the end of the history, or you disabled javascript.</p>
+<p>Loading suspended page...<br>
+<br>
+If nothing happens, something went wrong or you disabled JavaScript.</p>
 {% endblock %}

From 02104a318e9c8dfea690447a544f84c2dd19197b Mon Sep 17 00:00:00 2001
From: "mhm@mhm.com" <mhm@mhm.com>
Date: Mon, 4 Dec 2017 19:03:12 +0100
Subject: [PATCH 094/322] delay added, text changed

---
 qutebrowser/html/back.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index cfaae589b..46945ab65 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -24,7 +24,7 @@ function go_forward() {
 function prepare_restore() {
 	if (!document.hidden) {
 		go_back();
-		break;
+		return;
 	}
 		
 	document.addEventListener("visibilitychange", go_back);

From 9675ea93eebb51bcb80480a248ad209fc957dc29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Chavant?= <github@mail.chavant.info>
Date: Mon, 4 Dec 2017 20:31:28 +0100
Subject: [PATCH 095/322] Do not call pip in travis_install.sh when
 TESTENV=shellcheck

---
 scripts/dev/ci/travis_install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/dev/ci/travis_install.sh b/scripts/dev/ci/travis_install.sh
index 18ac44048..04b118b9b 100644
--- a/scripts/dev/ci/travis_install.sh
+++ b/scripts/dev/ci/travis_install.sh
@@ -96,6 +96,8 @@ case $TESTENV in
     eslint)
         npm_install eslint
         ;;
+    shellcheck)
+        ;;
     *)
         pip_install pip
         pip_install -r misc/requirements/requirements-tox.txt

From b554e1f7639d340fa704396b61cd7346914a28f6 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 4 Dec 2017 22:07:23 +0100
Subject: [PATCH 096/322] tests: Add after= argument to wait_for

---
 tests/end2end/fixtures/testprocess.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index a4b136193..c210f6fe7 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -333,7 +333,7 @@ class Process(QObject):
         else:
             return value == expected
 
-    def _wait_for_existing(self, override_waited_for, **kwargs):
+    def _wait_for_existing(self, override_waited_for, after, **kwargs):
         """Check if there are any line in the history for wait_for.
 
         Return: either the found line or None.
@@ -345,7 +345,15 @@ class Process(QObject):
                 value = getattr(line, key)
                 matches.append(self._match_data(value, expected))
 
-            if all(matches) and (not line.waited_for or override_waited_for):
+            if after is None:
+                too_early = False
+            else:
+                too_early = ((line.timestamp, line.msecs) <
+                             (after.timestamp, after.msecs))
+
+            if (all(matches) and
+                    (not line.waited_for or override_waited_for) and
+                    not too_early):
                 # If we waited for this line, chances are we don't mean the
                 # same thing the next time we use wait_for and it matches
                 # this line again.
@@ -422,7 +430,7 @@ class Process(QObject):
         pass
 
     def wait_for(self, timeout=None, *, override_waited_for=False,
-                 do_skip=False, divisor=1, **kwargs):
+                 do_skip=False, divisor=1, after=None, **kwargs):
         """Wait until a given value is found in the data.
 
         Keyword arguments to this function get interpreted as attributes of the
@@ -435,6 +443,7 @@ class Process(QObject):
                                  again.
             do_skip: If set, call pytest.skip on a timeout.
             divisor: A factor to decrease the timeout by.
+            after: If it's an existing line, ensure it's after the given one.
 
         Return:
             The matched line.
@@ -456,7 +465,8 @@ class Process(QObject):
         for key in kwargs:
             assert key in self.KEYS
 
-        existing = self._wait_for_existing(override_waited_for, **kwargs)
+        existing = self._wait_for_existing(override_waited_for, after,
+                                           **kwargs)
         if existing is not None:
             return existing
         else:

From a8f4444c24f785dfc24c107f67d5f8a2208d95d1 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 4 Dec 2017 22:07:49 +0100
Subject: [PATCH 097/322] tests: Show more of the message

---
 tests/end2end/fixtures/testprocess.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index c210f6fe7..bc987043f 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -371,7 +371,7 @@ class Process(QObject):
         __tracebackhide__ = lambda e: e.errisinstance(WaitForTimeout)
         message = kwargs.get('message', None)
         if message is not None:
-            elided = quteutils.elide(repr(message), 50)
+            elided = quteutils.elide(repr(message), 100)
             self._log("\n----> Waiting for {} in the log".format(elided))
 
         spy = QSignalSpy(self.new_data)

From 62228752aae48367b9393288f0b7cf90cace1401 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 5 Dec 2017 07:05:07 +0100
Subject: [PATCH 098/322] Fix most end2end tests with Qt 5.10

For some reason, if we don't wait for about:blank to be fully loaded with
Qt 5.10, we get the next LoadStatus.finished notification with about:blank as
URL.

This is most likely caused by the changes in
https://codereview.qt-project.org/#/c/202924/

See #3003
---
 tests/end2end/fixtures/quteprocess.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index 27c347ca4..454ae80a5 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -36,7 +36,7 @@ import pytest
 from PyQt5.QtCore import pyqtSignal, QUrl, qVersion
 
 from qutebrowser.misc import ipc
-from qutebrowser.utils import log, utils, javascript
+from qutebrowser.utils import log, utils, javascript, qtutils
 from helpers import utils as testutils
 from end2end.fixtures import testprocess
 
@@ -687,9 +687,12 @@ class QuteProc(testprocess.Process):
             raise ValueError("Invalid URL {}: {}".format(url,
                                                          qurl.errorString()))
 
-        if qurl == QUrl('about:blank'):
+        if (qurl == QUrl('about:blank') and
+                not qtutils.version_check('5.10', compiled=False)):
             # For some reason, we don't get a LoadStatus.success for
             # about:blank sometimes.
+            # However, if we do this for Qt 5.10, we get general testsuite
+            # instability as site loads get reported with about:blank...
             pattern = "Changing title for idx * to 'about:blank'"
         else:
             # We really need the same representation that the webview uses in

From 0ce9a355aed3a7df1932c0b7bda34aeb1e5d3ef4 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 5 Dec 2017 07:07:13 +0100
Subject: [PATCH 099/322] Fix download test with Qt 5.10

Not sure why this is needed (no prompt is shown otherwise), but it works like
this.

This probably is related to https://bugreports.qt.io/browse/QTBUG-63388

See #3003
---
 tests/end2end/features/downloads.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/end2end/features/downloads.feature b/tests/end2end/features/downloads.feature
index 69f47603b..833f63cb4 100644
--- a/tests/end2end/features/downloads.feature
+++ b/tests/end2end/features/downloads.feature
@@ -536,7 +536,7 @@ Feature: Downloading things from a website.
         And I open data/downloads/download.bin without waiting
         And I wait for the download prompt for "*"
         And I run :prompt-accept (tmpdir)(dirsep)downloads
-        And I open data/downloads/download.bin without waiting
+        And I open data/downloads/download2.bin without waiting
         And I wait for the download prompt for "*"
         And I directly open the download
         And I open data/downloads/download.bin without waiting

From 29c2e7b45f75cf6b1b3cdd4fb6cee341f20c7601 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 5 Dec 2017 07:09:43 +0100
Subject: [PATCH 100/322] Skip :follow-selected tests on Qt 5.10

See #3003, #2635
---
 tests/end2end/features/search.feature | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/end2end/features/search.feature b/tests/end2end/features/search.feature
index 3778f963d..56fcca207 100644
--- a/tests/end2end/features/search.feature
+++ b/tests/end2end/features/search.feature
@@ -225,11 +225,15 @@ Feature: Searching on a page
         Then the following tabs should be open:
             - data/search.html (active)
 
+    # Following a link selected via JS doesn't work in Qt 5.10 anymore.
+    @qt!=5.10
     Scenario: Follow a manually selected link
         When I run :jseval --file (testdata)/search_select.js
         And I run :follow-selected
         Then data/hello.txt should be loaded
 
+    # Following a link selected via JS doesn't work in Qt 5.10 anymore.
+    @qt!=5.10
     Scenario: Follow a manually selected link in a new tab
         When I run :window-only
         And I run :jseval --file (testdata)/search_select.js

From 8a3437c6a4edabf2212a8e37e9e8490be18fa1b0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 5 Dec 2017 09:36:14 +0100
Subject: [PATCH 101/322] Adjust Debian install instructions

---
 doc/install.asciidoc | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/doc/install.asciidoc b/doc/install.asciidoc
index 15718ec41..312e53176 100644
--- a/doc/install.asciidoc
+++ b/doc/install.asciidoc
@@ -35,7 +35,7 @@ Ubuntu 16.04 doesn't come with an up-to-date engine (a new enough QtWebKit, or
 QtWebEngine). However, it comes with Python 3.5, so you can
 <<tox,install qutebrowser via tox>>.
 
-Debian Stretch / Ubuntu 17.04 and newer
+Debian Stretch / Ubuntu 17.04 and 17.10
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Those versions come with QtWebEngine in the repositories. This makes it possible
@@ -54,7 +54,18 @@ Install the packages:
 # apt install ./qutebrowser_*_all.deb
 ----
 
-Some additional hints:
+Debian Testing / Ubuntu 18.04
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+On Debian Testing, qutebrowser is in the official repositories, and you can
+install it with apt:
+
+----
+# apt install qutebrowser
+----
+
+Additional hints
+~~~~~~~~~~~~~~~~
 
 - Alternatively, you can <<tox,install qutebrowser via tox>> to get a newer
   QtWebEngine version.

From 636f9edff62fb121bb52a1c25ec5903d24a18074 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Tue, 5 Dec 2017 07:31:55 -0500
Subject: [PATCH 102/322] History completion by both URL and title.

Resolves #1649.
---
 qutebrowser/completion/models/histcategory.py | 2 +-
 tests/unit/completion/test_histcategory.py    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/completion/models/histcategory.py b/qutebrowser/completion/models/histcategory.py
index b993b40de..fe89dc79b 100644
--- a/qutebrowser/completion/models/histcategory.py
+++ b/qutebrowser/completion/models/histcategory.py
@@ -47,7 +47,7 @@ class HistoryCategory(QSqlQueryModel):
             "FROM CompletionHistory",
             # the incoming pattern will have literal % and _ escaped with '\'
             # we need to tell sql to treat '\' as an escape character
-            "WHERE (url LIKE :pat escape '\\' or title LIKE :pat escape '\\')",
+            "WHERE ((url || title) LIKE :pat escape '\\')",
             self._atime_expr(),
             "ORDER BY last_atime DESC",
         ]), forward_only=False)
diff --git a/tests/unit/completion/test_histcategory.py b/tests/unit/completion/test_histcategory.py
index 834b3a5a3..b87eb6ac2 100644
--- a/tests/unit/completion/test_histcategory.py
+++ b/tests/unit/completion/test_histcategory.py
@@ -78,6 +78,10 @@ def hist(init_sql, config_stub):
     ("can't",
      [("can't touch this", ''), ('a', '')],
      [("can't touch this", '')]),
+
+    ("ample itle",
+     [('example.com', 'title'), ('example.com', 'nope')],
+     [('example.com', 'title')]),
 ])
 def test_set_pattern(pattern, before, after, model_validator, hist):
     """Validate the filtering and sorting results of set_pattern."""

From 00a09354c3231d78700187a33ac49d2bbf1aca30 Mon Sep 17 00:00:00 2001
From: Justin Partain <justinwpartain1@gmail.com>
Date: Tue, 5 Dec 2017 08:28:10 -0500
Subject: [PATCH 103/322] Track number of active searches in tab, ignore all
 but most recent search callbacks

---
 qutebrowser/browser/webengine/webenginetab.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 7339cd422..b40d8b871 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -126,13 +126,19 @@ class WebEngineSearch(browsertab.AbstractSearch):
     def __init__(self, parent=None):
         super().__init__(parent)
         self._flags = QWebEnginePage.FindFlags(0)
+        self.num_of_searches = 0
 
     def _find(self, text, flags, callback, caller):
         """Call findText on the widget."""
         self.search_displayed = True
+        self.num_of_searches += 1
 
         def wrapped_callback(found):
             """Wrap the callback to do debug logging."""
+            self.num_of_searches -= 1
+            if self.num_of_searches > 0:
+                return
+
             found_text = 'found' if found else "didn't find"
             if flags:
                 flag_text = 'with flags {}'.format(debug.qflags_key(

From 7f81f0c0ab79f9082d807f23561060f12cd9d05f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 06:51:15 +0100
Subject: [PATCH 104/322] Always open session tabs in foreground

This helps with issues with lazy sessions as document.hidden was set
incorrectly.

See #3345, #3366
---
 qutebrowser/misc/sessions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index 237e46189..bfd73ef32 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -422,7 +422,7 @@ class SessionManager(QObject):
                                         window=window.win_id)
             tab_to_focus = None
             for i, tab in enumerate(win['tabs']):
-                new_tab = tabbed_browser.tabopen()
+                new_tab = tabbed_browser.tabopen(background=False)
                 self._load_tab(new_tab, tab)
                 if tab.get('active', False):
                     tab_to_focus = i

From 7a6d568c8cd980e3b57c678070dfdea387245089 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 06:53:27 +0100
Subject: [PATCH 105/322] Remove blank line

---
 qutebrowser/html/back.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index 46945ab65..894427800 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -26,7 +26,7 @@ function prepare_restore() {
 		go_back();
 		return;
 	}
-		
+
 	document.addEventListener("visibilitychange", go_back);
 }
 

From 58212a7b15864b2a1b3b6afa73972908032f0e02 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 06:56:12 +0100
Subject: [PATCH 106/322] Update docs

---
 doc/changelog.asciidoc     | 2 ++
 doc/help/settings.asciidoc | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 34ee4ff7c..19714700a 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -51,6 +51,8 @@ Added
 - New `:edit-command` command to edit the commandline in an editor.
 - New `tabs.persist_mode_on_change` setting to keep the current mode when
   switching tabs.
+- New `session.lazy_restore` setting which allows to not load pages immediately
+  when restoring a session.
 
 Changed
 ~~~~~~~
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 2da7a5008..967f6c4c6 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -223,6 +223,7 @@
 |<<scrolling.bar,scrolling.bar>>|Show a scrollbar.
 |<<scrolling.smooth,scrolling.smooth>>|Enable smooth scrolling for web pages.
 |<<session.default_name,session.default_name>>|Name of the session to save by default.
+|<<session.lazy_restore,session.lazy_restore>>|Load a restored tab as soon as it takes focus.
 |<<spellcheck.languages,spellcheck.languages>>|Languages to use for spell checking.
 |<<statusbar.hide,statusbar.hide>>|Hide the statusbar unless a message is shown.
 |<<statusbar.padding,statusbar.padding>>|Padding (in pixels) for the statusbar.
@@ -2565,6 +2566,14 @@ Type: <<types,SessionName>>
 
 Default: empty
 
+[[session.lazy_restore]]
+=== session.lazy_restore
+Load a restored tab as soon as it takes focus.
+
+Type: <<types,Bool>>
+
+Default: +pass:[false]+
+
 [[spellcheck.languages]]
 === spellcheck.languages
 Languages to use for spell checking.

From 9c042e4313a7f1229e2bb8169f6151681937e8f9 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 06:58:22 +0100
Subject: [PATCH 107/322] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 19714700a..f734d96bc 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -91,6 +91,8 @@ Changed
   data dir, e.g. `~/.local/share/qutebrowser/js`.
 - The current/default bindings are now shown in the :bind completion.
 - Empty categories are now hidden in the `:open` completion.
+- Search terms for URLs and titles can now be mixed when filtering the
+  completion.
 
 Fixed
 ~~~~~

From b326f1242766212fb593ec7c0adc4dc0e77ddc98 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 06:59:08 +0100
Subject: [PATCH 108/322] Mark editor test as flaky

See #3367
---
 tests/end2end/features/editor.feature | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/end2end/features/editor.feature b/tests/end2end/features/editor.feature
index 21f3df425..3e1be47bc 100644
--- a/tests/end2end/features/editor.feature
+++ b/tests/end2end/features/editor.feature
@@ -117,6 +117,8 @@ Feature: Opening external editors
 
     # Could not get signals working on Windows
     @posix
+    # There's no guarantee that the tab gets deleted...
+    @flaky
     Scenario: Spawning an editor and closing the tab
         When I set up a fake editor that waits
         And I open data/editor.html

From 549a3a8f70686b1eb2e3a583c477482c94add605 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 07:41:41 +0100
Subject: [PATCH 109/322] Improve hist_importer messages

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

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index 36f151e6f..ba3369f5c 100755
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -66,9 +66,7 @@ def open_db(data_base):
         conn = sqlite3.connect(data_base)
         return conn
     else:
-        raise sys.exit('DataBaseNotFound: There was some error trying to to'
-                       ' connect with the [{}] database. Verify if the'
-                       ' given file path is correct.'.format(data_base))
+        sys.exit('The file {} does not exist.'.format(data_base))
 
 
 def extract(source, query):
@@ -89,8 +87,8 @@ def extract(source, query):
         conn.close()
         return history
     except sqlite3.OperationalError as op_e:
-        print('\nCould not perform queries into the source database: {}'
-              .format(op_e))
+        sys.exit('Could not perform queries on the source database: '
+                 '{}'.format(op_e))
 
 
 def clean(history):

From 16e09d18fa1207ccb78d6274965388c91a901f4c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 07:42:07 +0100
Subject: [PATCH 110/322] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index f734d96bc..4acd841b2 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -53,6 +53,7 @@ Added
   switching tabs.
 - New `session.lazy_restore` setting which allows to not load pages immediately
   when restoring a session.
+- New `hist_importer.py` script to import history from Firefox/Chromium.
 
 Changed
 ~~~~~~~

From a3ba7b9f60393445cce7e6128e9a82bcfade5f42 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 07:45:52 +0100
Subject: [PATCH 111/322] Reformat hist_importer epilog.

---
 scripts/hist_importer.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index ba3369f5c..f4ad47062 100755
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -33,11 +33,11 @@ def parse():
     """Parse command line arguments."""
     description = ("This program is meant to extract browser history from your"
                    " previous browser and import them into qutebrowser.")
-    epilog = ("Databases:\n\n\tqutebrowser: Is named 'history.sqlite' and can be"
-              " found at your --basedir. In order to find where your basedir"
-              " is you can run ':open qute:version' inside qutebrowser."
-              "\n\n\tFirefox: Is named 'places.sqlite', and can be found at your"
-              " system's profile folder. Check this link for where it is "
+    epilog = ("Databases:\n\n\tqutebrowser: Is named 'history.sqlite' and can "
+              "be found at your --basedir. In order to find where your "
+              "basedir is you can run ':open qute:version' inside qutebrowser."
+              "\n\n\tFirefox: Is named 'places.sqlite', and can be found at "
+              "your system's profile folder. Check this link for where it is "
               "located: http://kb.mozillazine.org/Profile_folder"
               "\n\n\tChrome: Is named 'History', and can be found at the "
               "respective User Data Directory. Check this link for where it is"

From 1a3f8662e6288cf46d0a9daf61d220718b94d448 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 07:56:59 +0100
Subject: [PATCH 112/322] Improve handling of cancelled search callbacks

---
 qutebrowser/browser/webengine/webenginetab.py | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 32bb95ca1..5a656e2b5 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -121,22 +121,33 @@ class WebEnginePrinting(browsertab.AbstractPrinting):
 
 class WebEngineSearch(browsertab.AbstractSearch):
 
-    """QtWebEngine implementations related to searching on the page."""
+    """QtWebEngine implementations related to searching on the page.
+
+    Attributes:
+        _flags: The QWebEnginePage.FindFlags of the last search.
+        _pending_searches: How many searches have been started but not called
+                           back yet.
+    """
 
     def __init__(self, parent=None):
         super().__init__(parent)
         self._flags = QWebEnginePage.FindFlags(0)
-        self.num_of_searches = 0
+        self._pending_searches = 0
 
     def _find(self, text, flags, callback, caller):
         """Call findText on the widget."""
         self.search_displayed = True
-        self.num_of_searches += 1
+        self._pending_searches += 1
 
         def wrapped_callback(found):
             """Wrap the callback to do debug logging."""
-            self.num_of_searches -= 1
-            if self.num_of_searches > 0:
+            self._pending_searches -= 1
+            if self._pending_searches > 0:
+                # See https://github.com/qutebrowser/qutebrowser/issues/2442
+                # and https://github.com/qt/qtwebengine/blob/5.10/src/core/web_contents_adapter.cpp#L924-L934
+                log.webview.debug("Ignoring cancelled search callback with "
+                                  "{} pending searches".format(
+                                      self._pending_searches))
                 return
 
             found_text = 'found' if found else "didn't find"

From 7d7c8412500ae4e486d8d88c6db97e457d8921ce Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 08:01:39 +0100
Subject: [PATCH 113/322] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 4acd841b2..2302a65c4 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -112,6 +112,8 @@ Fixed
   in a URL.
 - Using e.g. `-s backend webkit` to set the backend now works correctly.
 - Fixed crash when closing the tab an external editor was opened in.
+- When using `:search-next` before a search is finished, no warning about no
+  results being found is shown anymore.
 
 Deprecated
 ~~~~~~~~~~

From 129f97873a57d4b56b9c399e9da5c9da70dd880c Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Mon, 27 Nov 2017 20:07:16 +1300
Subject: [PATCH 114/322] Greasemonkey: add assert to tests scripts_for
 assumptions.

And crash the users browsing session as a result of any accidental and
totally, otherwise, non-fatal unforseen errors.
---
 qutebrowser/browser/webkit/webpage.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 89b293869..02aa270d7 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -323,6 +323,8 @@ class BrowserPage(QWebPage):
             # also indicate a bug.
             log.greasemonkey.debug("Not running scripts for frame with no "
                                    "url: {}".format(frame))
+            assert not toload, toload
+
         for script in toload:
             if frame is self.mainFrame() or script.runs_on_sub_frames:
                 log.webview.debug('Running GM script: {}'.format(script.name))

From ead108eeebadfc6e73b5927901eb155eebad028b Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 6 Dec 2017 20:27:56 +1300
Subject: [PATCH 115/322] fixup! Greasemonkey: Add run-at document-idle.

---
 qutebrowser/browser/greasemonkey.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 845b83d85..3fd01137f 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -193,8 +193,8 @@ class GreasemonkeyManager(QObject):
         match = functools.partial(fnmatch.fnmatch,
                                   url.toString(QUrl.FullyEncoded))
         tester = (lambda script:
-                  any([match(pat) for pat in script.includes]) and
-                  not any([match(pat) for pat in script.excludes]))
+                  any(match(pat) for pat in script.includes) and
+                  not any(match(pat) for pat in script.excludes))
         return MatchingScripts(
             url,
             [script for script in self._run_start if tester(script)],

From 6b3e16b1630acfc8a78f4a8994d9ad2279450386 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 6 Dec 2017 20:34:29 +1300
Subject: [PATCH 116/322] Greasemonkey: mark failing no(sub)frames test as
 flaky.

This test is supposed to ensure that user scripts don't run on iframes
when the @noframes directive is set in the greasemonkey metadata. It is
failing sometimes on travis but passing on local test runs. Personally I
haven't actually ran the whole test suite through, just the javascript
tests. It maybe be some stale state that only shows up when you run the
whole suite. It may be some timing issue that only shows up on travis
because ???. Hopefully this stops the red x from showing up on the PR.
---
 tests/end2end/features/javascript.feature | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/end2end/features/javascript.feature b/tests/end2end/features/javascript.feature
index aaad84be3..944d2606d 100644
--- a/tests/end2end/features/javascript.feature
+++ b/tests/end2end/features/javascript.feature
@@ -139,6 +139,7 @@ Feature: Javascript stuff
         And I open data/hints/iframe.html
         Then the javascript message "Script is running on /data/hints/html/wrapped.html" should be logged
 
+    @flaky
     Scenario: Have a greasemonkey script running on noframes
         When I have a greasemonkey file saved for document-end with noframes set
         And I run :greasemonkey-reload

From 0c792d228e4055c7195ee7b314bb522c8294dd84 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 11:12:25 +0100
Subject: [PATCH 117/322] Update docs

---
 doc/changelog.asciidoc              | 2 ++
 doc/help/commands.asciidoc          | 7 +++++++
 qutebrowser/browser/greasemonkey.py | 6 +++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 2302a65c4..16075db27 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -21,6 +21,8 @@ v1.1.0 (unreleased)
 Added
 ~~~~~
 
+- Initial support for Greasemonkey scripts. There are still some rough edges,
+  but many scripts should already work.
 - There's now a `misc/Makefile` file in releases, which should help
   distributions which package qutebrowser, as they can run something like
   `make -f misc/Makefile DESTDIR="$pkgdir" install` now.
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 0fb99f260..5d026bfca 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -54,6 +54,7 @@ It is possible to run or bind multiple commands by separating them with `;;`.
 |<<follow-selected,follow-selected>>|Follow the selected text.
 |<<forward,forward>>|Go forward in the history of the current tab.
 |<<fullscreen,fullscreen>>|Toggle fullscreen mode.
+|<<greasemonkey-reload,greasemonkey-reload>>|Re-read Greasemonkey scripts from disk.
 |<<help,help>>|Show help about a command or setting.
 |<<hint,hint>>|Start hinting.
 |<<history,history>>|Show browsing history.
@@ -491,6 +492,12 @@ Toggle fullscreen mode.
 ==== optional arguments
 * +*-l*+, +*--leave*+: Only leave fullscreen if it was entered by the page.
 
+[[greasemonkey-reload]]
+=== greasemonkey-reload
+Re-read Greasemonkey scripts from disk.
+
+The scripts are read from a 'greasemonkey' subdirectory in qutebrowser's data directory (see `:version`).
+
 [[help]]
 === help
 Syntax: +:help [*--tab*] [*--bg*] [*--window*] ['topic']+
diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 3fd01137f..1a1ec6a24 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -149,7 +149,11 @@ class GreasemonkeyManager(QObject):
     @cmdutils.register(name='greasemonkey-reload',
                        instance='greasemonkey')
     def load_scripts(self):
-        """Re-Read greasemonkey scripts from disk."""
+        """Re-read Greasemonkey scripts from disk.
+
+        The scripts are read from a 'greasemonkey' subdirectory in qutebrowser's
+        data directory (see `:version`).
+        """
         self._run_start = []
         self._run_end = []
         self._run_idle = []

From dd63508be772679b4a0e684f8c00c1a65e3e9861 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 11:30:01 +0100
Subject: [PATCH 118/322] Add a greasemonkey.init()

This also creates the greasemonkey directory if it doesn't exist yet, for
discoverability.
---
 qutebrowser/app.py                  |  3 +--
 qutebrowser/browser/greasemonkey.py | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index c32a208ac..7029f8df5 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -492,8 +492,7 @@ def _init_modules(args, crash_handler):
     objreg.register('cache', diskcache)
 
     log.init.debug("Initializing Greasemonkey...")
-    gm_manager = greasemonkey.GreasemonkeyManager()
-    objreg.register('greasemonkey', gm_manager)
+    greasemonkey.init()
 
     log.init.debug("Misc initialization...")
     macros.init()
diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 1a1ec6a24..669b9d0bc 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -29,7 +29,7 @@ import glob
 import attr
 from PyQt5.QtCore import pyqtSignal, QObject, QUrl
 
-from qutebrowser.utils import log, standarddir, jinja
+from qutebrowser.utils import log, standarddir, jinja, objreg
 from qutebrowser.commands import cmdutils
 
 
@@ -209,3 +209,14 @@ class GreasemonkeyManager(QObject):
     def all_scripts(self):
         """Return all scripts found in the configured script directory."""
         return self._run_start + self._run_end + self._run_idle
+
+
+def init():
+    """Initialize Greasemonkey support."""
+    gm_manager = GreasemonkeyManager()
+    objreg.register('greasemonkey', gm_manager)
+
+    try:
+        os.mkdir(_scripts_dir())
+    except FileExistsError:
+        pass

From 2633dcc0d572da84331362857872a3cd5af27e35 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 11:50:59 +0100
Subject: [PATCH 119/322] Fix lint

---
 qutebrowser/browser/greasemonkey.py           | 24 ++++++------
 .../browser/webengine/webenginesettings.py    | 13 +++----
 qutebrowser/browser/webengine/webview.py      |  2 +-
 qutebrowser/browser/webkit/webpage.py         |  4 +-
 .../javascript/greasemonkey_wrapper.js        | 38 +++++++++----------
 tests/end2end/features/javascript.feature     | 12 +++---
 tests/end2end/features/test_javascript_bdd.py |  4 +-
 tests/unit/javascript/test_greasemonkey.py    |  6 +--
 8 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 669b9d0bc..9a82d6a93 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Load, parse and make avalaible greasemonkey scripts."""
+"""Load, parse and make available Greasemonkey scripts."""
 
 import re
 import os
@@ -39,6 +39,7 @@ def _scripts_dir():
 
 
 class GreasemonkeyScript:
+
     """Container class for userscripts, parses metadata blocks."""
 
     def __init__(self, properties, code):
@@ -72,15 +73,15 @@ class GreasemonkeyScript:
 
     @classmethod
     def parse(cls, source):
-        """GreaseMonkeyScript factory.
+        """GreasemonkeyScript factory.
 
-        Takes a userscript source and returns a GreaseMonkeyScript.
-        Parses the greasemonkey metadata block, if present, to fill out
+        Takes a userscript source and returns a GreasemonkeyScript.
+        Parses the Greasemonkey metadata block, if present, to fill out
         attributes.
         """
         matches = re.split(cls.HEADER_REGEX, source, maxsplit=2)
         try:
-            _, props, _code = matches
+            _head, props, _code = matches
         except ValueError:
             props = ""
         script = cls(re.findall(cls.PROPS_REGEX, props), source)
@@ -90,9 +91,9 @@ class GreasemonkeyScript:
         return script
 
     def code(self):
-        """Return the processed javascript code of this script.
+        """Return the processed JavaScript code of this script.
 
-        Adorns the source code with GM_* methods for greasemonkey
+        Adorns the source code with GM_* methods for Greasemonkey
         compatibility and wraps it in an IFFE to hide it within a
         lexical scope. Note that this means line numbers in your
         browser's debugger/inspector will not match up to the line
@@ -118,6 +119,7 @@ class GreasemonkeyScript:
 
 @attr.s
 class MatchingScripts(object):
+
     """All userscripts registered to run on a particular url."""
 
     url = attr.ib()
@@ -128,11 +130,11 @@ class MatchingScripts(object):
 
 class GreasemonkeyManager(QObject):
 
-    """Manager of userscripts and a greasemonkey compatible environment.
+    """Manager of userscripts and a Greasemonkey compatible environment.
 
     Signals:
         scripts_reloaded: Emitted when scripts are reloaded from disk.
-            Any any cached or already-injected scripts should be
+            Any cached or already-injected scripts should be
             considered obselete.
     """
 
@@ -151,8 +153,8 @@ class GreasemonkeyManager(QObject):
     def load_scripts(self):
         """Re-read Greasemonkey scripts from disk.
 
-        The scripts are read from a 'greasemonkey' subdirectory in qutebrowser's
-        data directory (see `:version`).
+        The scripts are read from a 'greasemonkey' subdirectory in
+        qutebrowser's data directory (see `:version`).
         """
         self._run_start = []
         self._run_end = []
diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index dade671c8..c2c388993 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -245,10 +245,10 @@ def _init_profiles():
 
 
 def inject_userscripts():
-    """Register user javascript files with the global profiles."""
-    # The greasemonkey metadata block support in qtwebengine only starts at 5.8
-    # Otherwise have to handle injecting the scripts into the page at very
-    # early load, probs same place in view as the enableJS check.
+    """Register user JavaScript files with the global profiles."""
+    # The Greasemonkey metadata block support in QtWebEngine only starts at
+    # Qt 5.8. With 5.7.1, we need to inject the scripts ourselves in response
+    # to urlChanged.
     if not qtutils.version_check('5.8'):
         return
 
@@ -256,10 +256,7 @@ def inject_userscripts():
     # just get replaced by new gm scripts like if we were injecting them
     # ourselves so we need to remove all gm scripts, while not removing
     # any other stuff that might have been added. Like the one for
-    # stylsheets.
-    # Could either use a different world for gm scripts, check for gm metadata
-    # values (would mean no non-gm userscripts), or check the code for
-    # _qute_script_id
+    # stylesheets.
     for profile in [default_profile, private_profile]:
         scripts = profile.scripts()
         for script in scripts.toList():
diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py
index af4476d4a..0668e3aa5 100644
--- a/qutebrowser/browser/webengine/webview.py
+++ b/qutebrowser/browser/webengine/webview.py
@@ -308,7 +308,7 @@ class WebEnginePage(QWebEnginePage):
     def _inject_userjs(self, url):
         """Inject userscripts registered for `url` into the current page."""
         if qtutils.version_check('5.8'):
-            # Handled in webenginetab with the builtin greasemonkey
+            # Handled in webenginetab with the builtin Greasemonkey
             # support.
             return
 
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 02aa270d7..89407fcdf 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -95,7 +95,7 @@ class BrowserPage(QWebPage):
         """Connect userjs related signals to `frame`.
 
         Connect the signals used as triggers for injecting user
-        javascripts into the passed QWebFrame.
+        JavaScripts into the passed QWebFrame.
         """
         log.greasemonkey.debug("Connecting to frame {} ({})"
                                .format(frame, frame.url().toDisplayString()))
@@ -299,7 +299,7 @@ class BrowserPage(QWebPage):
             self.error_occurred = False
 
     def _inject_userjs(self, frame):
-        """Inject user javascripts into the page.
+        """Inject user JavaScripts into the page.
 
         Args:
             frame: The QWebFrame to inject the user scripts into.
diff --git a/qutebrowser/javascript/greasemonkey_wrapper.js b/qutebrowser/javascript/greasemonkey_wrapper.js
index e86991040..2d36220dc 100644
--- a/qutebrowser/javascript/greasemonkey_wrapper.js
+++ b/qutebrowser/javascript/greasemonkey_wrapper.js
@@ -1,5 +1,5 @@
-(function () {
-    const _qute_script_id = "__gm_"+{{ scriptName | tojson }};
+(function() {
+    const _qute_script_id = "__gm_" + {{ scriptName | tojson }};
 
     function GM_log(text) {
         console.log(text);
@@ -10,7 +10,8 @@
         'scriptMetaStr': {{ scriptMeta | tojson }},
         'scriptWillUpdate': false,
         'version': "0.0.1",
-        'scriptHandler': 'Tampermonkey' // so scripts don't expect exportFunction
+        // so scripts don't expect exportFunction
+        'scriptHandler': 'Tampermonkey',
     };
 
     function checkKey(key, funcName) {
@@ -40,7 +41,7 @@
     }
 
     function GM_listValues() {
-        let keys = [];
+        const keys = [];
         for (let i = 0; i < localStorage.length; i++) {
             if (localStorage.key(i).startsWith(_qute_script_id)) {
                 keys.push(localStorage.key(i).slice(_qute_script_id.length));
@@ -59,28 +60,28 @@
         details.method = details.method ? details.method.toUpperCase() : "GET";
 
         if (!details.url) {
-            throw ("GM_xmlhttpRequest requires an URL.");
+            throw new Error("GM_xmlhttpRequest requires an URL.");
         }
 
         // build XMLHttpRequest object
-        let oXhr = new XMLHttpRequest();
+        const oXhr = new XMLHttpRequest();
         // run it
         if ("onreadystatechange" in details) {
-            oXhr.onreadystatechange = function () {
+            oXhr.onreadystatechange = function() {
                 details.onreadystatechange(oXhr);
             };
         }
         if ("onload" in details) {
-            oXhr.onload = function () { details.onload(oXhr) };
+            oXhr.onload = function() { details.onload(oXhr); };
         }
         if ("onerror" in details) {
-            oXhr.onerror = function () { details.onerror(oXhr) };
+            oXhr.onerror = function () { details.onerror(oXhr); };
         }
 
         oXhr.open(details.method, details.url, true);
 
         if ("headers" in details) {
-            for (let header in details.headers) {
+            for (const header in details.headers) {
                 oXhr.setRequestHeader(header, details.headers[header]);
             }
         }
@@ -93,26 +94,25 @@
     }
 
     function GM_addStyle(/* String */ styles) {
-        let oStyle = document.createElement("style");
+        const oStyle = document.createElement("style");
         oStyle.setAttribute("type", "text/css");
         oStyle.appendChild(document.createTextNode(styles));
 
-        let head = document.getElementsByTagName("head")[0];
+        const head = document.getElementsByTagName("head")[0];
         if (head === undefined) {
-            document.onreadystatechange = function () {
-                if (document.readyState == "interactive") {
+            document.onreadystatechange = function() {
+                if (document.readyState === "interactive") {
                     document.getElementsByTagName("head")[0].appendChild(oStyle);
                 }
-            }
-        }
-        else {
+            };
+        } else {
             head.appendChild(oStyle);
         }
     }
 
     const unsafeWindow = window;
 
-    //====== The actual user script source ======//
+    // ====== The actual user script source ====== //
 {{ scriptSource }}
-    //====== End User Script ======//
+    // ====== End User Script ====== //
 })();
diff --git a/tests/end2end/features/javascript.feature b/tests/end2end/features/javascript.feature
index 944d2606d..3ccd50efb 100644
--- a/tests/end2end/features/javascript.feature
+++ b/tests/end2end/features/javascript.feature
@@ -124,8 +124,8 @@ Feature: Javascript stuff
         And I run :tab-next
         Then the window sizes should be the same
 
-    Scenario: Have a greasemonkey script run at page start
-        When I have a greasemonkey file saved for document-start with noframes unset
+    Scenario: Have a GreaseMonkey script run at page start
+        When I have a GreaseMonkey file saved for document-start with noframes unset
         And I run :greasemonkey-reload
         And I open data/hints/iframe.html
         # This second reload is required in webengine < 5.8 for scripts
@@ -133,15 +133,15 @@ Feature: Javascript stuff
         And I run :reload
         Then the javascript message "Script is running on /data/hints/iframe.html" should be logged
 
-    Scenario: Have a greasemonkey script running on frames
-        When I have a greasemonkey file saved for document-end with noframes unset
+    Scenario: Have a GreaseMonkey script running on frames
+        When I have a GreaseMonkey file saved for document-end with noframes unset
         And I run :greasemonkey-reload
         And I open data/hints/iframe.html
         Then the javascript message "Script is running on /data/hints/html/wrapped.html" should be logged
 
     @flaky
-    Scenario: Have a greasemonkey script running on noframes
-        When I have a greasemonkey file saved for document-end with noframes set
+    Scenario: Have a GreaseMonkey script running on noframes
+        When I have a GreaseMonkey file saved for document-end with noframes set
         And I run :greasemonkey-reload
         And I open data/hints/iframe.html
         Then the javascript message "Script is running on /data/hints/html/wrapped.html" should not be logged
diff --git a/tests/end2end/features/test_javascript_bdd.py b/tests/end2end/features/test_javascript_bdd.py
index 16896d4b5..8f69ef6d4 100644
--- a/tests/end2end/features/test_javascript_bdd.py
+++ b/tests/end2end/features/test_javascript_bdd.py
@@ -35,7 +35,7 @@ def check_window_sizes(quteproc):
 
 test_gm_script = r"""
 // ==UserScript==
-// @name Qutebrowser test userscript
+// @name qutebrowser test userscript
 // @namespace invalid.org
 // @include http://localhost:*/data/hints/iframe.html
 // @include http://localhost:*/data/hints/html/wrapped.html
@@ -47,7 +47,7 @@ console.log("Script is running on " + window.location.pathname);
 """
 
 
-@bdd.when(bdd.parsers.parse("I have a greasemonkey file saved for {stage} "
+@bdd.when(bdd.parsers.parse("I have a GreaseMonkey file saved for {stage} "
                             "with noframes {frameset}"))
 def create_greasemonkey_file(quteproc, stage, frameset):
     script_path = os.path.join(quteproc.basedir, 'data', 'greasemonkey')
diff --git a/tests/unit/javascript/test_greasemonkey.py b/tests/unit/javascript/test_greasemonkey.py
index b0ba64bdf..670be416d 100644
--- a/tests/unit/javascript/test_greasemonkey.py
+++ b/tests/unit/javascript/test_greasemonkey.py
@@ -28,7 +28,7 @@ from qutebrowser.browser import greasemonkey
 
 test_gm_script = """
 // ==UserScript==
-// @name Qutebrowser test userscript
+// @name qutebrowser test userscript
 // @namespace invalid.org
 // @include http://localhost:*/data/title.html
 // @match http://trolol*
@@ -58,7 +58,7 @@ def test_all():
 
     gm_manager = greasemonkey.GreasemonkeyManager()
     assert (gm_manager.all_scripts()[0].name ==
-            "Qutebrowser test userscript")
+            "qutebrowser test userscript")
 
 
 @pytest.mark.parametrize("url, expected_matches", [
@@ -70,7 +70,7 @@ def test_all():
     ('https://badhost.xxx/', 0),
 ])
 def test_get_scripts_by_url(url, expected_matches):
-    """Check greasemonkey include/exclude rules work."""
+    """Check Greasemonkey include/exclude rules work."""
     save_script(test_gm_script, 'test.user.js')
     gm_manager = greasemonkey.GreasemonkeyManager()
 

From a37ecc353cb29d5555dab019e3082a7d82d7eac7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 19:53:58 +0100
Subject: [PATCH 120/322] Simplify for loop

---
 qutebrowser/browser/webengine/webenginesettings.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index c2c388993..35eb4b916 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -257,6 +257,7 @@ def inject_userscripts():
     # ourselves so we need to remove all gm scripts, while not removing
     # any other stuff that might have been added. Like the one for
     # stylesheets.
+    greasemonkey = objreg.get('greasemonkey')
     for profile in [default_profile, private_profile]:
         scripts = profile.scripts()
         for script in scripts.toList():
@@ -265,9 +266,7 @@ def inject_userscripts():
                                        .format(script.name()))
                 scripts.remove(script)
 
-    for profile in [default_profile, private_profile]:
-        scripts = profile.scripts()
-        greasemonkey = objreg.get('greasemonkey')
+        # Then add the new scripts.
         for script in greasemonkey.all_scripts():
             new_script = QWebEngineScript()
             new_script.setWorldId(QWebEngineScript.MainWorld)

From 6aafe02320d539943967896cc4901c2eafcb2f47 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 19:56:44 +0100
Subject: [PATCH 121/322] Make sure scripts are removed correctly

---
 qutebrowser/browser/webengine/webenginesettings.py | 5 +++--
 qutebrowser/browser/webengine/webview.py           | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index 35eb4b916..adc7a1034 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -262,9 +262,10 @@ def inject_userscripts():
         scripts = profile.scripts()
         for script in scripts.toList():
             if script.name().startswith("GM-"):
-                log.greasemonkey.debug('removing script: {}'
+                log.greasemonkey.debug('Removing script: {}'
                                        .format(script.name()))
-                scripts.remove(script)
+                removed = scripts.remove(script)
+                assert removed, script.name()
 
         # Then add the new scripts.
         for script in greasemonkey.all_scripts():
diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py
index 0668e3aa5..b313fc36c 100644
--- a/qutebrowser/browser/webengine/webview.py
+++ b/qutebrowser/browser/webengine/webview.py
@@ -319,9 +319,10 @@ class WebEnginePage(QWebEnginePage):
         scripts = self.scripts()
         for script in scripts.toList():
             if script.name().startswith("GM-"):
-                really_removed = scripts.remove(script)
-                log.greasemonkey.debug("Removing ({}) script: {}"
-                                       .format(really_removed, script.name()))
+                log.greasemonkey.debug("Removing script: {}"
+                                       .format(script.name()))
+                removed = scripts.remove(script)
+                assert removed, script.name()
 
         def _add_script(script, injection_point):
             new_script = QWebEngineScript()

From d6039a0e348651fd4b482b325b4b3ed3c5e146b5 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 20:30:46 +0100
Subject: [PATCH 122/322] Fix markers for editor test

---
 tests/end2end/features/editor.feature | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/end2end/features/editor.feature b/tests/end2end/features/editor.feature
index 3e1be47bc..15da4a6cd 100644
--- a/tests/end2end/features/editor.feature
+++ b/tests/end2end/features/editor.feature
@@ -116,9 +116,8 @@ Feature: Opening external editors
         Then the javascript message "text: foobar" should be logged
 
     # Could not get signals working on Windows
-    @posix
     # There's no guarantee that the tab gets deleted...
-    @flaky
+    @posix @flaky
     Scenario: Spawning an editor and closing the tab
         When I set up a fake editor that waits
         And I open data/editor.html

From eb90f9835fa2e159842ae16072b80109b08a977c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 20:54:14 +0100
Subject: [PATCH 123/322] Mark qute://settings test as flaky

---
 tests/end2end/features/qutescheme.feature | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/end2end/features/qutescheme.feature b/tests/end2end/features/qutescheme.feature
index 51db7f767..1f13a8ac1 100644
--- a/tests/end2end/features/qutescheme.feature
+++ b/tests/end2end/features/qutescheme.feature
@@ -113,6 +113,8 @@ Feature: Special qute:// pages
         And I wait for "Config option changed: ignore_case *" in the log
         Then the option ignore_case should be set to always
 
+    # Sometimes, an unrelated value gets set
+    @flaky
     Scenario: Focusing input fields in qute://settings and entering invalid value
         When I open qute://settings
         # scroll to the right - the table does not fit in the default screen

From 04d200452817e58d357627ca87aabe6ef7e6b044 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 20:58:14 +0100
Subject: [PATCH 124/322] tox: Fix eslint environment

We need to set basepython there to not get InterpreterNotFound
---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index e59e8b660..5b8bc05b5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -181,6 +181,7 @@ commands =
 [testenv:eslint]
 # This is duplicated in travis_run.sh for Travis CI because we can't get tox in
 # the JavaScript environment easily.
+basepython = python3
 deps =
 whitelist_externals = eslint
 changedir = {toxinidir}/qutebrowser/javascript

From 30b25da2735e597104f9f6b4fde6842261fcac86 Mon Sep 17 00:00:00 2001
From: unknown <evanlee123@email.arizona.edu>
Date: Wed, 6 Dec 2017 13:09:44 -0700
Subject: [PATCH 125/322] Added protocol key to field

---
 qutebrowser/config/configdata.yml   | 4 ++++
 qutebrowser/mainwindow/tabwidget.py | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 08c854ed3..efcc07b35 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1292,6 +1292,7 @@ tabs.title.format:
       - host
       - private
       - current_url
+      - protocol
     none_ok: true
   desc: |
     Format to use for the tab title.
@@ -1308,6 +1309,7 @@ tabs.title.format:
     * `{backend}`: Either ''webkit'' or ''webengine''
     * `{private}` : Indicates when private mode is enabled.
     * `{current_url}` : URL of the current web page.
+    * `{protocol}` : Internet Protocol of the current web page.
 
 tabs.title.format_pinned:
   default: '{index}'
@@ -1324,6 +1326,7 @@ tabs.title.format_pinned:
       - host
       - private
       - current_url
+      - protocol
     none_ok: true
   desc: Format to use for the tab title for pinned tabs. The same placeholders
     like for `tabs.title.format` are defined.
@@ -1467,6 +1470,7 @@ window.title_format:
       - backend
       - private
       - current_url
+      - protocol
   default: '{perc}{title}{title_sep}qutebrowser'
   desc: |
     Format to use for the window title. The same placeholders like for
diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index b14466337..31615cccc 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -181,6 +181,11 @@ class TabWidget(QTabWidget):
         except qtutils.QtValueError:
             fields['current_url'] = ''
 
+        try:
+            fields['protocol'] = self.tab_url(idx).url(options = QUrl.RemovePath)
+        except qtutils.QtValueError:
+            fields['protocol']= ''
+
         y = tab.scroller.pos_perc()[1]
         if y is None:
             scroll_pos = '???'

From f033b228b1d94f7dbba54e552bdf7eb2870a9dd0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 6 Dec 2017 20:22:03 +0100
Subject: [PATCH 126/322] Use py.path.local in save_script

---
 tests/unit/javascript/test_greasemonkey.py | 24 +++++++++-------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/tests/unit/javascript/test_greasemonkey.py b/tests/unit/javascript/test_greasemonkey.py
index 670be416d..0f5fe476c 100644
--- a/tests/unit/javascript/test_greasemonkey.py
+++ b/tests/unit/javascript/test_greasemonkey.py
@@ -18,10 +18,10 @@
 
 """Tests for qutebrowser.browser.greasemonkey."""
 
-import os
 import logging
 
 import pytest
+import py.path  # pylint: disable=no-name-in-module
 from PyQt5.QtCore import QUrl
 
 from qutebrowser.browser import greasemonkey
@@ -41,20 +41,16 @@ console.log("Script is running.");
 pytestmark = pytest.mark.usefixtures('data_tmpdir')
 
 
-def save_script(script_text, filename):
-    script_path = greasemonkey._scripts_dir()
-    try:
-        os.mkdir(script_path)
-    except FileExistsError:
-        pass
-    file_path = os.path.join(script_path, filename)
-    with open(file_path, 'w', encoding='utf-8') as f:
-        f.write(script_text)
+def _save_script(script_text, filename):
+    # pylint: disable=no-member
+    file_path = py.path.local(greasemonkey._scripts_dir()) / filename
+    # pylint: enable=no-member
+    file_path.write_text(script_text, encoding='utf-8', ensure=True)
 
 
 def test_all():
     """Test that a script gets read from file, parsed and returned."""
-    save_script(test_gm_script, 'test.user.js')
+    _save_script(test_gm_script, 'test.user.js')
 
     gm_manager = greasemonkey.GreasemonkeyManager()
     assert (gm_manager.all_scripts()[0].name ==
@@ -71,7 +67,7 @@ def test_all():
 ])
 def test_get_scripts_by_url(url, expected_matches):
     """Check Greasemonkey include/exclude rules work."""
-    save_script(test_gm_script, 'test.user.js')
+    _save_script(test_gm_script, 'test.user.js')
     gm_manager = greasemonkey.GreasemonkeyManager()
 
     scripts = gm_manager.scripts_for(QUrl(url))
@@ -81,7 +77,7 @@ def test_get_scripts_by_url(url, expected_matches):
 
 def test_no_metadata(caplog):
     """Run on all sites at document-end is the default."""
-    save_script("var nothing = true;\n", 'nothing.user.js')
+    _save_script("var nothing = true;\n", 'nothing.user.js')
 
     with caplog.at_level(logging.WARNING):
         gm_manager = greasemonkey.GreasemonkeyManager()
@@ -93,7 +89,7 @@ def test_no_metadata(caplog):
 
 def test_bad_scheme(caplog):
     """qute:// isn't in the list of allowed schemes."""
-    save_script("var nothing = true;\n", 'nothing.user.js')
+    _save_script("var nothing = true;\n", 'nothing.user.js')
 
     with caplog.at_level(logging.WARNING):
         gm_manager = greasemonkey.GreasemonkeyManager()

From 94809032a46dddbce62f279d0d9e5b85e50eb52b Mon Sep 17 00:00:00 2001
From: unknown <evanlee123@email.arizona.edu>
Date: Wed, 6 Dec 2017 13:24:27 -0700
Subject: [PATCH 127/322] field[protocol] gives the right protocol]

---
 qutebrowser/mainwindow/tabwidget.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index 31615cccc..988455a08 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -182,7 +182,7 @@ class TabWidget(QTabWidget):
             fields['current_url'] = ''
 
         try:
-            fields['protocol'] = self.tab_url(idx).url(options = QUrl.RemovePath)
+            fields['protocol'] = self.tab_url(idx).scheme()
         except qtutils.QtValueError:
             fields['protocol']= ''
 

From 02b24e8dfb4e7a2e65c363ba4e82708386e8e81a Mon Sep 17 00:00:00 2001
From: evanlee123 <31551958+evanlee123@users.noreply.github.com>
Date: Wed, 6 Dec 2017 21:35:09 -0700
Subject: [PATCH 128/322] Update tabwidget.py

---
 qutebrowser/mainwindow/tabwidget.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index 988455a08..01b9f0728 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -184,7 +184,7 @@ class TabWidget(QTabWidget):
         try:
             fields['protocol'] = self.tab_url(idx).scheme()
         except qtutils.QtValueError:
-            fields['protocol']= ''
+            fields['protocol'] = ''
 
         y = tab.scroller.pos_perc()[1]
         if y is None:

From 4d13941290f28dfe5de2ec3be3238fba41fb263b Mon Sep 17 00:00:00 2001
From: evanlee123 <31551958+evanlee123@users.noreply.github.com>
Date: Wed, 6 Dec 2017 23:57:19 -0700
Subject: [PATCH 129/322] added the scheme field to FakeURL

---
 tests/helpers/stubs.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py
index 878c9e166..cb3c85896 100644
--- a/tests/helpers/stubs.py
+++ b/tests/helpers/stubs.py
@@ -131,11 +131,12 @@ class FakeUrl:
 
     """QUrl stub which provides .path(), isValid() and host()."""
 
-    def __init__(self, path=None, valid=True, host=None, url=None):
+    def __init__(self, path=None, valid=True, host=None, url=None, scheme = None):
         self.path = mock.Mock(return_value=path)
         self.isValid = mock.Mock(returl_value=valid)
         self.host = mock.Mock(returl_value=host)
         self.url = mock.Mock(return_value=url)
+        self.scheme = mock.Mock(return_value=scheme)
 
 
 class FakeNetworkReply:

From d4cadcc62ea4ecd65b88aec90a27ceef8ed9fa86 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 7 Dec 2017 08:17:15 +0100
Subject: [PATCH 130/322] Add comment about @run-at

[ci skip]
---
 qutebrowser/browser/webengine/webenginesettings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index adc7a1034..f8b54e065 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -269,6 +269,8 @@ def inject_userscripts():
 
         # Then add the new scripts.
         for script in greasemonkey.all_scripts():
+            # @run-at (and @include/@exclude/@match) is parsed by
+            # QWebEngineScript.
             new_script = QWebEngineScript()
             new_script.setWorldId(QWebEngineScript.MainWorld)
             new_script.setSourceCode(script.code())

From 20ac618752a6e33f7cd8ed51e6e8da8213eee29b Mon Sep 17 00:00:00 2001
From: evanlee123 <31551958+evanlee123@users.noreply.github.com>
Date: Thu, 7 Dec 2017 02:04:02 -0700
Subject: [PATCH 131/322] Simplified code in get_tab_fields

changed self.tab_url(idx) to url in get_tab_fields()
---
 qutebrowser/mainwindow/tabwidget.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index 01b9f0728..9dc6cd9bf 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -165,6 +165,8 @@ class TabWidget(QTabWidget):
         fields['perc_raw'] = tab.progress()
         fields['backend'] = objects.backend.name
         fields['private'] = ' [Private Mode] ' if tab.private else ''
+        
+        url = self.tab_url(idx)
 
         if tab.load_status() == usertypes.LoadStatus.loading:
             fields['perc'] = '[{}%] '.format(tab.progress())
@@ -172,17 +174,17 @@ class TabWidget(QTabWidget):
             fields['perc'] = ''
 
         try:
-            fields['host'] = self.tab_url(idx).host()
+            fields['host'] = url.host()
         except qtutils.QtValueError:
             fields['host'] = ''
 
         try:
-            fields['current_url'] = self.tab_url(idx).url()
+            fields['current_url'] = url.url()
         except qtutils.QtValueError:
             fields['current_url'] = ''
 
         try:
-            fields['protocol'] = self.tab_url(idx).scheme()
+            fields['protocol'] = url.scheme()
         except qtutils.QtValueError:
             fields['protocol'] = ''
 

From d1a00eb93446e501e97871485738b903668a89a5 Mon Sep 17 00:00:00 2001
From: evanlee123 <31551958+evanlee123@users.noreply.github.com>
Date: Thu, 7 Dec 2017 02:35:34 -0700
Subject: [PATCH 132/322] Clarity on protocol field

---
 qutebrowser/config/configdata.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index efcc07b35..7c94d4701 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1307,9 +1307,9 @@ tabs.title.format:
     * `{scroll_pos}`: Page scroll position.
     * `{host}`: Host of the current web page.
     * `{backend}`: Either ''webkit'' or ''webengine''
-    * `{private}` : Indicates when private mode is enabled.
-    * `{current_url}` : URL of the current web page.
-    * `{protocol}` : Internet Protocol of the current web page.
+    * `{private}`: Indicates when private mode is enabled.
+    * `{current_url}`: URL of the current web page.
+    * `{protocol}`: Protocol (http/https/...) of the current web page
 
 tabs.title.format_pinned:
   default: '{index}'

From 18609f1a2444cc533c4fabdf046f3da9ff6e3278 Mon Sep 17 00:00:00 2001
From: evanlee123 <31551958+evanlee123@users.noreply.github.com>
Date: Thu, 7 Dec 2017 02:36:31 -0700
Subject: [PATCH 133/322] fixed spacing on FakeURL

---
 tests/helpers/stubs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py
index cb3c85896..d2c0fd746 100644
--- a/tests/helpers/stubs.py
+++ b/tests/helpers/stubs.py
@@ -131,7 +131,7 @@ class FakeUrl:
 
     """QUrl stub which provides .path(), isValid() and host()."""
 
-    def __init__(self, path=None, valid=True, host=None, url=None, scheme = None):
+    def __init__(self, path=None, valid=True, host=None, url=None, scheme=None):
         self.path = mock.Mock(return_value=path)
         self.isValid = mock.Mock(returl_value=valid)
         self.host = mock.Mock(returl_value=host)

From 25526f00bf959432c2d0d40606169a50173476b3 Mon Sep 17 00:00:00 2001
From: unknown <evanlee123@email.arizona.edu>
Date: Thu, 7 Dec 2017 15:47:03 -0700
Subject: [PATCH 134/322] fixed catch error in tabwidget

---
 qutebrowser/mainwindow/tabwidget.py | 16 +++++-----------
 tests/helpers/stubs.py              |  3 ++-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index 9dc6cd9bf..28cfac0fb 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -165,8 +165,6 @@ class TabWidget(QTabWidget):
         fields['perc_raw'] = tab.progress()
         fields['backend'] = objects.backend.name
         fields['private'] = ' [Private Mode] ' if tab.private else ''
-        
-        url = self.tab_url(idx)
 
         if tab.load_status() == usertypes.LoadStatus.loading:
             fields['perc'] = '[{}%] '.format(tab.progress())
@@ -174,19 +172,15 @@ class TabWidget(QTabWidget):
             fields['perc'] = ''
 
         try:
-            fields['host'] = url.host()
+            url = self.tab_url(idx)
         except qtutils.QtValueError:
             fields['host'] = ''
-
-        try:
-            fields['current_url'] = url.url()
-        except qtutils.QtValueError:
             fields['current_url'] = ''
-
-        try:
-            fields['protocol'] = url.scheme()
-        except qtutils.QtValueError:
             fields['protocol'] = ''
+        else:
+            fields['host'] = url.host()
+            fields['current_url'] = url.toDisplayString()
+            fields['protocol'] = url.scheme()
 
         y = tab.scroller.pos_perc()[1]
         if y is None:
diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py
index d2c0fd746..ede073130 100644
--- a/tests/helpers/stubs.py
+++ b/tests/helpers/stubs.py
@@ -131,7 +131,8 @@ class FakeUrl:
 
     """QUrl stub which provides .path(), isValid() and host()."""
 
-    def __init__(self, path=None, valid=True, host=None, url=None, scheme=None):
+    def __init__(self, path=None, valid=True, host=None, url=None,
+                 scheme=None):
         self.path = mock.Mock(return_value=path)
         self.isValid = mock.Mock(returl_value=valid)
         self.host = mock.Mock(returl_value=host)

From 9685eb36b69e091cc99652f4cfc4f73d331d1aab Mon Sep 17 00:00:00 2001
From: evanlee123 <31551958+evanlee123@users.noreply.github.com>
Date: Thu, 7 Dec 2017 16:30:34 -0700
Subject: [PATCH 135/322] Changed FakeUrl's url command to toDisplayString

---
 tests/helpers/stubs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py
index ede073130..0fd2ba0ed 100644
--- a/tests/helpers/stubs.py
+++ b/tests/helpers/stubs.py
@@ -136,7 +136,7 @@ class FakeUrl:
         self.path = mock.Mock(return_value=path)
         self.isValid = mock.Mock(returl_value=valid)
         self.host = mock.Mock(returl_value=host)
-        self.url = mock.Mock(return_value=url)
+        self.toDisplayString = mock.Mock(return_value=url)
         self.scheme = mock.Mock(return_value=scheme)
 
 

From 9f9311840a2a46b25288d5ed2f432bec27802a9a Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Fri, 8 Dec 2017 16:44:53 +0000
Subject: [PATCH 136/322] Add --output-to-tab flag for :spawn.

This puts the exit status, stdout, and stderr in a new tab.
---
 doc/help/commands.asciidoc        |  3 ++-
 qutebrowser/browser/commands.py   |  6 ++++--
 qutebrowser/browser/qutescheme.py |  8 ++++++++
 qutebrowser/misc/guiprocess.py    | 33 ++++++++++++++++++++++++++++---
 4 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 5d026bfca..2487b8c85 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -1148,7 +1148,7 @@ Set a mark at the current scroll position in the current tab.
 
 [[spawn]]
 === spawn
-Syntax: +:spawn [*--userscript*] [*--verbose*] [*--detach*] 'cmdline'+
+Syntax: +:spawn [*--userscript*] [*--verbose*] [*--output-to-tab*] [*--detach*] 'cmdline'+
 
 Spawn a command in a shell.
 
@@ -1163,6 +1163,7 @@ Spawn a command in a shell.
  - `/usr/share/qutebrowser/userscripts`
 
 * +*-v*+, +*--verbose*+: Show notifications when the command started/exited.
+* +*-v*+, +*--output-to-tab*+: Show stderr, stdout, and exit status in a new tab.
 * +*-d*+, +*--detach*+: Whether the command should be detached from qutebrowser.
 
 ==== note
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index bced4daf4..8c623aa37 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1177,7 +1177,8 @@ class CommandDispatcher:
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        maxsplit=0, no_replace_variables=True)
-    def spawn(self, cmdline, userscript=False, verbose=False, detach=False):
+    def spawn(self, cmdline, userscript=False, verbose=False,
+            output_to_tab=False, detach=False):
         """Spawn a command in a shell.
 
         Args:
@@ -1208,7 +1209,8 @@ class CommandDispatcher:
         else:
             cmd = os.path.expanduser(cmd)
             proc = guiprocess.GUIProcess(what='command', verbose=verbose,
-                                         parent=self._tabbed_browser)
+                                         parent=self._tabbed_browser,
+                                         output_to_tab=output_to_tab)
             if detach:
                 proc.start_detached(cmd, args)
             else:
diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index e6262a007..3bd2c66a4 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -42,6 +42,7 @@ from qutebrowser.misc import objects
 
 
 pyeval_output = ":pyeval was never called"
+spawn_output = ":spawn was never called"
 
 
 _HANDLERS = {}
@@ -268,6 +269,13 @@ def qute_pyeval(_url):
     return 'text/html', html
 
 
+@add_handler('spawn_output')
+def qute_spawn_output(_url):
+    """Handler for qute://spawn_output."""
+    html = jinja.render('pre.html', title='spawn output', content=spawn_output)
+    return 'text/html', html
+
+
 @add_handler('version')
 @add_handler('verizon')
 def qute_version(_url):
diff --git a/qutebrowser/misc/guiprocess.py b/qutebrowser/misc/guiprocess.py
index 1adf6817e..3c2057864 100644
--- a/qutebrowser/misc/guiprocess.py
+++ b/qutebrowser/misc/guiprocess.py
@@ -22,9 +22,11 @@
 import shlex
 
 from PyQt5.QtCore import (pyqtSlot, pyqtSignal, QObject, QProcess,
-                          QProcessEnvironment)
+                          QProcessEnvironment, QUrl)
 
-from qutebrowser.utils import message, log
+from qutebrowser.utils import message, log, objreg
+
+from qutebrowser.browser import qutescheme
 
 # A mapping of QProcess::ErrorCode's to human-readable strings.
 
@@ -62,10 +64,11 @@ class GUIProcess(QObject):
     started = pyqtSignal()
 
     def __init__(self, what, *, verbose=False, additional_env=None,
-                 parent=None):
+                 parent=None, output_to_tab=False):
         super().__init__(parent)
         self._what = what
         self.verbose = verbose
+        self.output_to_tab = output_to_tab
         self._started = False
         self.cmd = None
         self.args = None
@@ -96,6 +99,30 @@ class GUIProcess(QObject):
         self._started = False
         log.procs.debug("Process finished with code {}, status {}.".format(
             code, status))
+
+        stdout = None
+        stderr = None
+
+        if self.output_to_tab:
+            stderr = bytes(self._proc.readAllStandardError()).decode('utf-8')
+            stdout = bytes(self._proc.readAllStandardOutput()).decode('utf-8')
+
+            spawn_log = ""
+
+            spawn_log += "Process finished with code {},status {}.".format(
+                code, status)
+
+            if stdout:
+                spawn_log += "\nProcess stdout:\n" + stdout.strip()
+            if stderr:
+                spawn_log += "\nProcess stderr:\n" + stderr.strip()
+
+            qutescheme.spawn_output = spawn_log
+
+            tabbed_browser = objreg.get('tabbed-browser', scope='window',
+                                    window='last-focused')
+            tabbed_browser.openurl(QUrl('qute://spawn_output'), newtab=True)
+
         if status == QProcess.CrashExit:
             message.error("{} crashed!".format(self._what.capitalize()))
         elif status == QProcess.NormalExit and code == 0:

From 9f8dbe95e47e5ac9440b89e31c72edb79857ee0a Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Fri, 8 Dec 2017 19:00:46 +0000
Subject: [PATCH 137/322] Code review changes.

This fixes the following problems found in a review:

1. Manual modification of the asciidoc has been undone.
2. --output-to-tab has been renamed to the less verbose --output.
3. spawn_output has been changed to spawn-output in the url.
4. Erroneous newline in imports has been removed.
5. output in guiprocess.py has been marked private.
6. If there is no output for either stderr or stdout, say so.
7. Missing space in a text line was added.
8. Redundant initialising of an empty string removed.
---
 doc/help/commands.asciidoc        |  4 ++--
 qutebrowser/browser/commands.py   |  5 +++--
 qutebrowser/browser/qutescheme.py |  4 ++--
 qutebrowser/misc/guiprocess.py    | 24 ++++++++++--------------
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 2487b8c85..3da81a391 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -1148,7 +1148,7 @@ Set a mark at the current scroll position in the current tab.
 
 [[spawn]]
 === spawn
-Syntax: +:spawn [*--userscript*] [*--verbose*] [*--output-to-tab*] [*--detach*] 'cmdline'+
+Syntax: +:spawn [*--userscript*] [*--verbose*] [*--output*] [*--detach*] 'cmdline'+
 
 Spawn a command in a shell.
 
@@ -1163,7 +1163,7 @@ Spawn a command in a shell.
  - `/usr/share/qutebrowser/userscripts`
 
 * +*-v*+, +*--verbose*+: Show notifications when the command started/exited.
-* +*-v*+, +*--output-to-tab*+: Show stderr, stdout, and exit status in a new tab.
+* +*-o*+, +*--output*+: Whether the output should be shown in a new tab.
 * +*-d*+, +*--detach*+: Whether the command should be detached from qutebrowser.
 
 ==== note
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 8c623aa37..7ad73708a 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1178,7 +1178,7 @@ class CommandDispatcher:
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        maxsplit=0, no_replace_variables=True)
     def spawn(self, cmdline, userscript=False, verbose=False,
-            output_to_tab=False, detach=False):
+            output=False, detach=False):
         """Spawn a command in a shell.
 
         Args:
@@ -1189,6 +1189,7 @@ class CommandDispatcher:
                               (or `$XDG_DATA_DIR`)
                             - `/usr/share/qutebrowser/userscripts`
             verbose: Show notifications when the command started/exited.
+            output: Whether the output should be shown in a new tab.
             detach: Whether the command should be detached from qutebrowser.
             cmdline: The commandline to execute.
         """
@@ -1210,7 +1211,7 @@ class CommandDispatcher:
             cmd = os.path.expanduser(cmd)
             proc = guiprocess.GUIProcess(what='command', verbose=verbose,
                                          parent=self._tabbed_browser,
-                                         output_to_tab=output_to_tab)
+                                         output=output)
             if detach:
                 proc.start_detached(cmd, args)
             else:
diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 3bd2c66a4..32bc5806a 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -269,9 +269,9 @@ def qute_pyeval(_url):
     return 'text/html', html
 
 
-@add_handler('spawn_output')
+@add_handler('spawn-output')
 def qute_spawn_output(_url):
-    """Handler for qute://spawn_output."""
+    """Handler for qute://spawn-output."""
     html = jinja.render('pre.html', title='spawn output', content=spawn_output)
     return 'text/html', html
 
diff --git a/qutebrowser/misc/guiprocess.py b/qutebrowser/misc/guiprocess.py
index 3c2057864..32a4fbf62 100644
--- a/qutebrowser/misc/guiprocess.py
+++ b/qutebrowser/misc/guiprocess.py
@@ -25,7 +25,6 @@ from PyQt5.QtCore import (pyqtSlot, pyqtSignal, QObject, QProcess,
                           QProcessEnvironment, QUrl)
 
 from qutebrowser.utils import message, log, objreg
-
 from qutebrowser.browser import qutescheme
 
 # A mapping of QProcess::ErrorCode's to human-readable strings.
@@ -50,6 +49,7 @@ class GUIProcess(QObject):
         cmd: The command which was started.
         args: A list of arguments which gets passed.
         verbose: Whether to show more messages.
+        _output: Whether to show the output in a new tab.
         _started: Whether the underlying process is started.
         _proc: The underlying QProcess.
         _what: What kind of thing is spawned (process/editor/userscript/...).
@@ -64,11 +64,11 @@ class GUIProcess(QObject):
     started = pyqtSignal()
 
     def __init__(self, what, *, verbose=False, additional_env=None,
-                 parent=None, output_to_tab=False):
+                 parent=None, output=False):
         super().__init__(parent)
         self._what = what
         self.verbose = verbose
-        self.output_to_tab = output_to_tab
+        self._output = output
         self._started = False
         self.cmd = None
         self.args = None
@@ -100,28 +100,24 @@ class GUIProcess(QObject):
         log.procs.debug("Process finished with code {}, status {}.".format(
             code, status))
 
-        stdout = None
-        stderr = None
-
-        if self.output_to_tab:
+        if self._output:
             stderr = bytes(self._proc.readAllStandardError()).decode('utf-8')
             stdout = bytes(self._proc.readAllStandardOutput()).decode('utf-8')
 
-            spawn_log = ""
+            stderr = stderr or "(No output)"
+            stdout = stdout or "(No output)"
 
-            spawn_log += "Process finished with code {},status {}.".format(
+            spawn_log = "Process finished with code {}, status {}.".format(
                 code, status)
 
-            if stdout:
-                spawn_log += "\nProcess stdout:\n" + stdout.strip()
-            if stderr:
-                spawn_log += "\nProcess stderr:\n" + stderr.strip()
+            spawn_log += "\nProcess stdout:\n" + stdout.strip()
+            spawn_log += "\nProcess stderr:\n" + stderr.strip()
 
             qutescheme.spawn_output = spawn_log
 
             tabbed_browser = objreg.get('tabbed-browser', scope='window',
                                     window='last-focused')
-            tabbed_browser.openurl(QUrl('qute://spawn_output'), newtab=True)
+            tabbed_browser.openurl(QUrl('qute://spawn-output'), newtab=True)
 
         if status == QProcess.CrashExit:
             message.error("{} crashed!".format(self._what.capitalize()))

From 038bb85a67c1115c7091f89c3f83fa55381ea647 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Sun, 10 Dec 2017 19:12:47 +0000
Subject: [PATCH 138/322] Capture stdout and stderr always for spawn.

This change makes it so that stderr and stdout is unconditionally read
from for a completed process, and sent to qute://spawn-output. This
allows the user to see the results of the previous process, even if they
had forgotten to use --output.
---
 qutebrowser/misc/guiprocess.py | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/qutebrowser/misc/guiprocess.py b/qutebrowser/misc/guiprocess.py
index 32a4fbf62..9d0b50be6 100644
--- a/qutebrowser/misc/guiprocess.py
+++ b/qutebrowser/misc/guiprocess.py
@@ -100,21 +100,18 @@ class GUIProcess(QObject):
         log.procs.debug("Process finished with code {}, status {}.".format(
             code, status))
 
+        stderr = bytes(self._proc.readAllStandardError()).decode('utf-8')
+        stdout = bytes(self._proc.readAllStandardOutput()).decode('utf-8')
+
+        spawn_log = "Process finished with code {}, status {}.".format(
+            code, status)
+
+        spawn_log += "\nProcess stdout:\n" + (stdout or "(No output)").strip()
+        spawn_log += "\nProcess stderr:\n" + (stderr or "(No output)").strip()
+
+        qutescheme.spawn_output = spawn_log
+
         if self._output:
-            stderr = bytes(self._proc.readAllStandardError()).decode('utf-8')
-            stdout = bytes(self._proc.readAllStandardOutput()).decode('utf-8')
-
-            stderr = stderr or "(No output)"
-            stdout = stdout or "(No output)"
-
-            spawn_log = "Process finished with code {}, status {}.".format(
-                code, status)
-
-            spawn_log += "\nProcess stdout:\n" + stdout.strip()
-            spawn_log += "\nProcess stderr:\n" + stderr.strip()
-
-            qutescheme.spawn_output = spawn_log
-
             tabbed_browser = objreg.get('tabbed-browser', scope='window',
                                     window='last-focused')
             tabbed_browser.openurl(QUrl('qute://spawn-output'), newtab=True)
@@ -132,8 +129,6 @@ class GUIProcess(QObject):
             message.error("{} exited with status {}, see :messages for "
                           "details.".format(self._what.capitalize(), code))
 
-            stderr = bytes(self._proc.readAllStandardError()).decode('utf-8')
-            stdout = bytes(self._proc.readAllStandardOutput()).decode('utf-8')
             if stdout:
                 log.procs.error("Process stdout:\n" + stdout.strip())
             if stderr:

From d32a4ea99e2d3ff691c14b6ba8ff8ec6d3d4a35a Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Sun, 10 Dec 2017 23:45:43 +0000
Subject: [PATCH 139/322] Seperate _output from guiprocess and keep window
 opening in spawn.

This removes the extraneous variable, and makes testing easier.
---
 qutebrowser/browser/commands.py |  8 ++++++--
 qutebrowser/misc/guiprocess.py  | 33 ++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 7ad73708a..495d48414 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1210,13 +1210,17 @@ class CommandDispatcher:
         else:
             cmd = os.path.expanduser(cmd)
             proc = guiprocess.GUIProcess(what='command', verbose=verbose,
-                                         parent=self._tabbed_browser,
-                                         output=output)
+                                         parent=self._tabbed_browser)
             if detach:
                 proc.start_detached(cmd, args)
             else:
                 proc.start(cmd, args)
 
+        if output:
+            tabbed_browser = objreg.get('tabbed-browser', scope='window',
+                                    window='last-focused')
+            tabbed_browser.openurl(QUrl('qute://spawn-output'), newtab=True)
+
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def home(self):
         """Open main startpage in current tab."""
diff --git a/qutebrowser/misc/guiprocess.py b/qutebrowser/misc/guiprocess.py
index 9d0b50be6..80803f53f 100644
--- a/qutebrowser/misc/guiprocess.py
+++ b/qutebrowser/misc/guiprocess.py
@@ -22,9 +22,9 @@
 import shlex
 
 from PyQt5.QtCore import (pyqtSlot, pyqtSignal, QObject, QProcess,
-                          QProcessEnvironment, QUrl)
+                          QProcessEnvironment)
 
-from qutebrowser.utils import message, log, objreg
+from qutebrowser.utils import message, log
 from qutebrowser.browser import qutescheme
 
 # A mapping of QProcess::ErrorCode's to human-readable strings.
@@ -49,7 +49,6 @@ class GUIProcess(QObject):
         cmd: The command which was started.
         args: A list of arguments which gets passed.
         verbose: Whether to show more messages.
-        _output: Whether to show the output in a new tab.
         _started: Whether the underlying process is started.
         _proc: The underlying QProcess.
         _what: What kind of thing is spawned (process/editor/userscript/...).
@@ -64,11 +63,10 @@ class GUIProcess(QObject):
     started = pyqtSignal()
 
     def __init__(self, what, *, verbose=False, additional_env=None,
-                 parent=None, output=False):
+                 parent=None):
         super().__init__(parent)
         self._what = what
         self.verbose = verbose
-        self._output = output
         self._started = False
         self.cmd = None
         self.args = None
@@ -103,18 +101,8 @@ class GUIProcess(QObject):
         stderr = bytes(self._proc.readAllStandardError()).decode('utf-8')
         stdout = bytes(self._proc.readAllStandardOutput()).decode('utf-8')
 
-        spawn_log = "Process finished with code {}, status {}.".format(
-            code, status)
-
-        spawn_log += "\nProcess stdout:\n" + (stdout or "(No output)").strip()
-        spawn_log += "\nProcess stderr:\n" + (stderr or "(No output)").strip()
-
-        qutescheme.spawn_output = spawn_log
-
-        if self._output:
-            tabbed_browser = objreg.get('tabbed-browser', scope='window',
-                                    window='last-focused')
-            tabbed_browser.openurl(QUrl('qute://spawn-output'), newtab=True)
+        qutescheme.spawn_output = self.spawn_format(code, status,
+                                                    stdout, stderr)
 
         if status == QProcess.CrashExit:
             message.error("{} crashed!".format(self._what.capitalize()))
@@ -134,6 +122,17 @@ class GUIProcess(QObject):
             if stderr:
                 log.procs.error("Process stderr:\n" + stderr.strip())
 
+    def spawn_format(self, code=0, status=0, stdout="", stderr=""):
+        """Produce a formatted string for spawn output."""
+        stdout = (stdout or "(No output)").strip()
+        stderr = (stderr or "(No output)").strip()
+
+        spawn_string = ("Process finished with code {}, status {}\n"
+                        "\nProcess stdout:\n {}"
+                        "\nProcess stderr:\n {}").format(code, status,
+                                                       stdout, stderr)
+        return spawn_string
+
     @pyqtSlot()
     def on_started(self):
         """Called when the process started successfully."""

From 3b10584749c09b44e85ce45233da7d3fe0e870e9 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Sun, 10 Dec 2017 23:46:35 +0000
Subject: [PATCH 140/322] Update tests to work with the earlier consumption of
 stdin etc.

Note: this adds an element to vulture's whitelist that vulture
mistakenly identified as unused.
---
 scripts/dev/run_vulture.py         |  1 +
 tests/unit/misc/test_guiprocess.py | 30 +++++++++++++++++++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/scripts/dev/run_vulture.py b/scripts/dev/run_vulture.py
index 9d21ad428..657d4b85e 100755
--- a/scripts/dev/run_vulture.py
+++ b/scripts/dev/run_vulture.py
@@ -82,6 +82,7 @@ def whitelist_generator():  # noqa
     yield 'qutebrowser.utils.jinja.Loader.get_source'
     yield 'qutebrowser.utils.log.QtWarningFilter.filter'
     yield 'qutebrowser.browser.pdfjs.is_available'
+    yield 'qutebrowser.misc.guiprocess.spawn_output'
     yield 'QEvent.posted'
     yield 'log_stack'  # from message.py
     yield 'propagate'  # logging.getLogger('...).propagate = False
diff --git a/tests/unit/misc/test_guiprocess.py b/tests/unit/misc/test_guiprocess.py
index 674c250e5..69ce3812f 100644
--- a/tests/unit/misc/test_guiprocess.py
+++ b/tests/unit/misc/test_guiprocess.py
@@ -19,7 +19,6 @@
 
 """Tests for qutebrowser.misc.guiprocess."""
 
-import json
 import logging
 
 import pytest
@@ -27,6 +26,7 @@ from PyQt5.QtCore import QProcess, QIODevice
 
 from qutebrowser.misc import guiprocess
 from qutebrowser.utils import usertypes
+from qutebrowser.browser import qutescheme
 
 
 @pytest.fixture()
@@ -60,7 +60,7 @@ def test_start(proc, qtbot, message_mock, py_proc):
         proc.start(*argv)
 
     assert not message_mock.messages
-    assert bytes(proc._proc.readAll()).rstrip() == b'test'
+    assert qutescheme.spawn_output == proc.spawn_format(0, 0, stdout="test")
 
 
 def test_start_verbose(proc, qtbot, message_mock, py_proc):
@@ -77,7 +77,24 @@ def test_start_verbose(proc, qtbot, message_mock, py_proc):
     assert msgs[1].level == usertypes.MessageLevel.info
     assert msgs[0].text.startswith("Executing:")
     assert msgs[1].text == "Testprocess exited successfully."
-    assert bytes(proc._proc.readAll()).rstrip() == b'test'
+    assert qutescheme.spawn_output == proc.spawn_format(0, 0, stdout="test")
+
+
+def test_start_output(proc, qtbot, message_mock, py_proc):
+    """Test starting a process verbosely."""
+    proc.verbose = True
+
+    with qtbot.waitSignals([proc.started, proc.finished], timeout=10000,
+                           order='strict'):
+        argv = py_proc("import sys; print('test'); sys.exit(0)")
+        proc.start(*argv)
+
+    msgs = message_mock.messages
+    assert msgs[0].level == usertypes.MessageLevel.info
+    assert msgs[1].level == usertypes.MessageLevel.info
+    assert msgs[0].text.startswith("Executing:")
+    assert msgs[1].text == "Testprocess exited successfully."
+    assert qutescheme.spawn_output == proc.spawn_format(0, 0, stdout="test")
 
 
 def test_start_env(monkeypatch, qtbot, py_proc):
@@ -99,10 +116,9 @@ def test_start_env(monkeypatch, qtbot, py_proc):
                            order='strict'):
         proc.start(*argv)
 
-    data = bytes(proc._proc.readAll()).decode('utf-8')
-    ret_env = json.loads(data)
-    assert 'QUTEBROWSER_TEST_1' in ret_env
-    assert 'QUTEBROWSER_TEST_2' in ret_env
+    data = qutescheme.spawn_output
+    assert 'QUTEBROWSER_TEST_1' in data
+    assert 'QUTEBROWSER_TEST_2' in data
 
 
 @pytest.mark.qt_log_ignore('QIODevice::read.*: WriteOnly device')

From 2a8b74cbec45d70dd0964384779ba69e1348bd28 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 11 Dec 2017 07:10:17 +0100
Subject: [PATCH 141/322] Get rid of FakeUrl stub

We can just use a real QUrl...
---
 tests/helpers/stubs.py | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py
index 0fd2ba0ed..3f6a23958 100644
--- a/tests/helpers/stubs.py
+++ b/tests/helpers/stubs.py
@@ -24,7 +24,7 @@
 from unittest import mock
 
 import attr
-from PyQt5.QtCore import pyqtSignal, QPoint, QProcess, QObject
+from PyQt5.QtCore import pyqtSignal, QPoint, QProcess, QObject, QUrl
 from PyQt5.QtNetwork import (QNetworkRequest, QAbstractNetworkCache,
                              QNetworkCacheMetaData)
 from PyQt5.QtWidgets import QCommonStyle, QLineEdit, QWidget, QTabBar
@@ -127,19 +127,6 @@ class FakeQApplication:
         self.activeWindow = lambda: active_window
 
 
-class FakeUrl:
-
-    """QUrl stub which provides .path(), isValid() and host()."""
-
-    def __init__(self, path=None, valid=True, host=None, url=None,
-                 scheme=None):
-        self.path = mock.Mock(return_value=path)
-        self.isValid = mock.Mock(returl_value=valid)
-        self.host = mock.Mock(returl_value=host)
-        self.toDisplayString = mock.Mock(return_value=url)
-        self.scheme = mock.Mock(return_value=scheme)
-
-
 class FakeNetworkReply:
 
     """QNetworkReply stub which provides a Content-Disposition header."""
@@ -150,7 +137,7 @@ class FakeNetworkReply:
 
     def __init__(self, headers=None, url=None):
         if url is None:
-            url = FakeUrl()
+            url = QUrl()
         if headers is None:
             self.headers = {}
         else:
@@ -246,7 +233,7 @@ class FakeWebTab(browsertab.AbstractTab):
 
     """Fake AbstractTab to use in tests."""
 
-    def __init__(self, url=FakeUrl(), title='', tab_id=0, *,
+    def __init__(self, url=QUrl(), title='', tab_id=0, *,
                  scroll_pos_perc=(0, 0),
                  load_status=usertypes.LoadStatus.success,
                  progress=0, can_go_back=None, can_go_forward=None):

From 444f0a36dfba2f54a279b0ca8dffd2c601211666 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 11 Dec 2017 07:12:45 +0100
Subject: [PATCH 142/322] Update docs

---
 doc/changelog.asciidoc            | 1 +
 doc/help/settings.asciidoc        | 5 +++--
 qutebrowser/config/configdata.yml | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 16075db27..4192ee054 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -56,6 +56,7 @@ Added
 - New `session.lazy_restore` setting which allows to not load pages immediately
   when restoring a session.
 - New `hist_importer.py` script to import history from Firefox/Chromium.
+- New `{protocol}` replacement for `tabs.title.format` and friends.
 
 Changed
 ~~~~~~~
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 967f6c4c6..28480486f 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -2913,8 +2913,9 @@ The following placeholders are defined:
 * `{scroll_pos}`: Page scroll position.
 * `{host}`: Host of the current web page.
 * `{backend}`: Either ''webkit'' or ''webengine''
-* `{private}` : Indicates when private mode is enabled.
-* `{current_url}` : URL of the current web page.
+* `{private}`: Indicates when private mode is enabled.
+* `{current_url}`: URL of the current web page.
+* `{protocol}`: Protocol (http/https/...) of the current web page.
 
 
 Type: <<types,FormatString>>
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index d96718d78..1318e8979 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1317,7 +1317,7 @@ tabs.title.format:
     * `{backend}`: Either ''webkit'' or ''webengine''
     * `{private}`: Indicates when private mode is enabled.
     * `{current_url}`: URL of the current web page.
-    * `{protocol}`: Protocol (http/https/...) of the current web page
+    * `{protocol}`: Protocol (http/https/...) of the current web page.
 
 tabs.title.format_pinned:
   default: '{index}'

From f7a94b946f02dae81d32616ed3467ca51314aec1 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 11 Dec 2017 08:12:13 +0100
Subject: [PATCH 143/322] Add changelog for font size change

See 22f3fade24dbe6b3bdf737c8395360ca9e6b203b
---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 4192ee054..fddb3f6a5 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -97,6 +97,7 @@ Changed
 - Empty categories are now hidden in the `:open` completion.
 - Search terms for URLs and titles can now be mixed when filtering the
   completion.
+- The default font size for the UI got bumped up from 8pt to 10pt.
 
 Fixed
 ~~~~~

From 6a7d2f4275e18b289cdc41cab6e06984bea2d271 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 11 Dec 2017 09:14:26 +0100
Subject: [PATCH 144/322] Remove dead code

QUrl.path() never returns None
---
 qutebrowser/browser/webkit/http.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/qutebrowser/browser/webkit/http.py b/qutebrowser/browser/webkit/http.py
index 08cad7a44..7f5173943 100644
--- a/qutebrowser/browser/webkit/http.py
+++ b/qutebrowser/browser/webkit/http.py
@@ -57,9 +57,7 @@ def parse_content_disposition(reply):
             is_inline = content_disposition.is_inline()
     # Then try to get filename from url
     if not filename:
-        path = reply.url().path()
-        if path is not None:
-            filename = path.rstrip('/')
+        filename = reply.url().path().rstrip('/')
     # If that fails as well, use a fallback
     if not filename:
         filename = 'qutebrowser-download'

From 72d847d687ad00effb73d77e8b0b395f34bdcdf0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 11 Dec 2017 09:36:27 +0100
Subject: [PATCH 145/322] travis: Use newer macOS image

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0ea8218a6..251842d06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ matrix:
       env: TESTENV=py36-pyqt59-cov
     - os: osx
       env: TESTENV=py36 OSX=sierra
-      osx_image: xcode8.3
+      osx_image: xcode9.2
       language: generic
     # https://github.com/qutebrowser/qutebrowser/issues/2013
     # - os: osx

From 8909e03f1cea998b6e997486e2541bce3d94d71b Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sun, 10 Dec 2017 15:06:45 -0500
Subject: [PATCH 146/322] Match url completion terms in any order.

Perviously, 'foo bar' would match 'foo/bar' but not 'bar/foo'. Now it
will match both, using a query with a WHERE clause like:

WHERE ((url || title) like '%foo%' AND (url || title) like '%bar%')

This does not seem to change the performance benchmark. However, it does
create a new query for every character added rather than re-running the
same query with different parameters. We could re-use queries if we
maintained a list like self._queries=[1_arg_query, 2_arg_query, ...].
However, it isn't clear that such a complexity would be necessary.

Resolves #1651.
---
 qutebrowser/completion/models/histcategory.py | 42 ++++++++++---------
 tests/unit/completion/test_histcategory.py    |  2 +-
 tests/unit/completion/test_models.py          |  4 +-
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/qutebrowser/completion/models/histcategory.py b/qutebrowser/completion/models/histcategory.py
index fe89dc79b..03ddb5ff8 100644
--- a/qutebrowser/completion/models/histcategory.py
+++ b/qutebrowser/completion/models/histcategory.py
@@ -37,21 +37,6 @@ class HistoryCategory(QSqlQueryModel):
         super().__init__(parent=parent)
         self.name = "History"
 
-        # replace ' in timestamp-format to avoid breaking the query
-        timestamp_format = config.val.completion.timestamp_format
-        timefmt = ("strftime('{}', last_atime, 'unixepoch', 'localtime')"
-                   .format(timestamp_format.replace("'", "`")))
-
-        self._query = sql.Query(' '.join([
-            "SELECT url, title, {}".format(timefmt),
-            "FROM CompletionHistory",
-            # the incoming pattern will have literal % and _ escaped with '\'
-            # we need to tell sql to treat '\' as an escape character
-            "WHERE ((url || title) LIKE :pat escape '\\')",
-            self._atime_expr(),
-            "ORDER BY last_atime DESC",
-        ]), forward_only=False)
-
         # advertise that this model filters by URL and title
         self.columns_to_filter = [0, 1]
         self.delete_func = delete_func
@@ -86,11 +71,30 @@ class HistoryCategory(QSqlQueryModel):
         # escape to treat a user input % or _ as a literal, not a wildcard
         pattern = pattern.replace('%', '\\%')
         pattern = pattern.replace('_', '\\_')
-        # treat spaces as wildcards to match any of the typed words
-        pattern = re.sub(r' +', '%', pattern)
-        pattern = '%{}%'.format(pattern)
+        words = ['%{}%'.format(w) for w in pattern.split(' ')]
+
+        wheres = ' AND '.join([
+            "(url || title) LIKE :pat{} escape '\\'".format(i)
+            for i in range(len(words))])
+
+        # replace ' in timestamp-format to avoid breaking the query
+        timestamp_format = config.val.completion.timestamp_format
+        timefmt = ("strftime('{}', last_atime, 'unixepoch', 'localtime')"
+                   .format(timestamp_format.replace("'", "`")))
+
+        self._query = sql.Query(' '.join([
+            "SELECT url, title, {}".format(timefmt),
+            "FROM CompletionHistory",
+            # the incoming pattern will have literal % and _ escaped with '\'
+            # we need to tell sql to treat '\' as an escape character
+            'WHERE ({})'.format(wheres),
+            self._atime_expr(),
+            "ORDER BY last_atime DESC",
+        ]), forward_only=False)
+
         with debug.log_time('sql', 'Running completion query'):
-            self._query.run(pat=pattern)
+            self._query.run(**{
+                'pat{}'.format(i): w for i, w in enumerate(words)})
         self.setQuery(self._query)
 
     def removeRows(self, row, _count, _parent=None):
diff --git a/tests/unit/completion/test_histcategory.py b/tests/unit/completion/test_histcategory.py
index b87eb6ac2..8458c3311 100644
--- a/tests/unit/completion/test_histcategory.py
+++ b/tests/unit/completion/test_histcategory.py
@@ -61,7 +61,7 @@ def hist(init_sql, config_stub):
 
     ('foo bar',
      [('foo', ''), ('bar foo', ''), ('xfooyybarz', '')],
-     [('xfooyybarz', '')]),
+     [('bar foo', ''), ('xfooyybarz', '')]),
 
     ('foo%bar',
      [('foo%bar', ''), ('foo bar', ''), ('foobar', '')],
diff --git a/tests/unit/completion/test_models.py b/tests/unit/completion/test_models.py
index 8879f3201..c4d224dcc 100644
--- a/tests/unit/completion/test_models.py
+++ b/tests/unit/completion/test_models.py
@@ -414,12 +414,12 @@ def test_url_completion_no_bookmarks(qtmodeltester, web_history_populated,
     ('example.com', 'Site Title', 'am', 1),
     ('example.com', 'Site Title', 'com', 1),
     ('example.com', 'Site Title', 'ex com', 1),
-    ('example.com', 'Site Title', 'com ex', 0),
+    ('example.com', 'Site Title', 'com ex', 1),
     ('example.com', 'Site Title', 'ex foo', 0),
     ('example.com', 'Site Title', 'foo com', 0),
     ('example.com', 'Site Title', 'exm', 0),
     ('example.com', 'Site Title', 'Si Ti', 1),
-    ('example.com', 'Site Title', 'Ti Si', 0),
+    ('example.com', 'Site Title', 'Ti Si', 1),
     ('example.com', '', 'foo', 0),
     ('foo_bar', '', '_', 1),
     ('foobar', '', '_', 0),

From a2bcd68d5628bcc1f0df47dd965bedf302855729 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Mon, 11 Dec 2017 13:35:39 +0000
Subject: [PATCH 147/322] Code review changes.

This fixes whitespace and alignment issues, and removes a stray test.
---
 qutebrowser/browser/commands.py    |  4 ++--
 qutebrowser/misc/guiprocess.py     |  6 +++---
 tests/unit/misc/test_guiprocess.py | 21 ++-------------------
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 495d48414..3075a24da 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1178,7 +1178,7 @@ class CommandDispatcher:
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        maxsplit=0, no_replace_variables=True)
     def spawn(self, cmdline, userscript=False, verbose=False,
-            output=False, detach=False):
+              output=False, detach=False):
         """Spawn a command in a shell.
 
         Args:
@@ -1218,7 +1218,7 @@ class CommandDispatcher:
 
         if output:
             tabbed_browser = objreg.get('tabbed-browser', scope='window',
-                                    window='last-focused')
+                                        window='last-focused')
             tabbed_browser.openurl(QUrl('qute://spawn-output'), newtab=True)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
diff --git a/qutebrowser/misc/guiprocess.py b/qutebrowser/misc/guiprocess.py
index 80803f53f..4b74a512d 100644
--- a/qutebrowser/misc/guiprocess.py
+++ b/qutebrowser/misc/guiprocess.py
@@ -101,7 +101,7 @@ class GUIProcess(QObject):
         stderr = bytes(self._proc.readAllStandardError()).decode('utf-8')
         stdout = bytes(self._proc.readAllStandardOutput()).decode('utf-8')
 
-        qutescheme.spawn_output = self.spawn_format(code, status,
+        qutescheme.spawn_output = self._spawn_format(code, status,
                                                     stdout, stderr)
 
         if status == QProcess.CrashExit:
@@ -122,7 +122,7 @@ class GUIProcess(QObject):
             if stderr:
                 log.procs.error("Process stderr:\n" + stderr.strip())
 
-    def spawn_format(self, code=0, status=0, stdout="", stderr=""):
+    def _spawn_format(self, code=0, status=0, stdout="", stderr=""):
         """Produce a formatted string for spawn output."""
         stdout = (stdout or "(No output)").strip()
         stderr = (stderr or "(No output)").strip()
@@ -130,7 +130,7 @@ class GUIProcess(QObject):
         spawn_string = ("Process finished with code {}, status {}\n"
                         "\nProcess stdout:\n {}"
                         "\nProcess stderr:\n {}").format(code, status,
-                                                       stdout, stderr)
+                                                         stdout, stderr)
         return spawn_string
 
     @pyqtSlot()
diff --git a/tests/unit/misc/test_guiprocess.py b/tests/unit/misc/test_guiprocess.py
index 69ce3812f..25e46476e 100644
--- a/tests/unit/misc/test_guiprocess.py
+++ b/tests/unit/misc/test_guiprocess.py
@@ -60,7 +60,7 @@ def test_start(proc, qtbot, message_mock, py_proc):
         proc.start(*argv)
 
     assert not message_mock.messages
-    assert qutescheme.spawn_output == proc.spawn_format(0, 0, stdout="test")
+    assert qutescheme.spawn_output == proc._spawn_format(stdout="test")
 
 
 def test_start_verbose(proc, qtbot, message_mock, py_proc):
@@ -77,24 +77,7 @@ def test_start_verbose(proc, qtbot, message_mock, py_proc):
     assert msgs[1].level == usertypes.MessageLevel.info
     assert msgs[0].text.startswith("Executing:")
     assert msgs[1].text == "Testprocess exited successfully."
-    assert qutescheme.spawn_output == proc.spawn_format(0, 0, stdout="test")
-
-
-def test_start_output(proc, qtbot, message_mock, py_proc):
-    """Test starting a process verbosely."""
-    proc.verbose = True
-
-    with qtbot.waitSignals([proc.started, proc.finished], timeout=10000,
-                           order='strict'):
-        argv = py_proc("import sys; print('test'); sys.exit(0)")
-        proc.start(*argv)
-
-    msgs = message_mock.messages
-    assert msgs[0].level == usertypes.MessageLevel.info
-    assert msgs[1].level == usertypes.MessageLevel.info
-    assert msgs[0].text.startswith("Executing:")
-    assert msgs[1].text == "Testprocess exited successfully."
-    assert qutescheme.spawn_output == proc.spawn_format(0, 0, stdout="test")
+    assert qutescheme.spawn_output == proc._spawn_format(stdout="test")
 
 
 def test_start_env(monkeypatch, qtbot, py_proc):

From dd7a082265d4e15567c31bf61d1baec0fb232892 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 11 Dec 2017 16:23:12 +0100
Subject: [PATCH 148/322] Update codecov from 2.0.9 to 2.0.10

---
 misc/requirements/requirements-codecov.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-codecov.txt b/misc/requirements/requirements-codecov.txt
index 31c319c39..6601cfb12 100644
--- a/misc/requirements/requirements-codecov.txt
+++ b/misc/requirements/requirements-codecov.txt
@@ -2,7 +2,7 @@
 
 certifi==2017.11.5
 chardet==3.0.4
-codecov==2.0.9
+codecov==2.0.10
 coverage==4.4.2
 idna==2.6
 requests==2.18.4

From 519dc6a7c9f890f2377fc71d716f7d0ddfa4b6ce Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 11 Dec 2017 16:23:13 +0100
Subject: [PATCH 149/322] Update setuptools from 38.2.3 to 38.2.4

---
 misc/requirements/requirements-pip.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt
index 8ca5a867e..b7914cac5 100644
--- a/misc/requirements/requirements-pip.txt
+++ b/misc/requirements/requirements-pip.txt
@@ -3,6 +3,6 @@
 appdirs==1.4.3
 packaging==16.8
 pyparsing==2.2.0
-setuptools==38.2.3
+setuptools==38.2.4
 six==1.11.0
 wheel==0.30.0

From 713a2ef2c169a19db1ab6f7c97e60c2e1d2e2806 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 11 Dec 2017 16:23:15 +0100
Subject: [PATCH 150/322] Update pylint from 1.7.4 to 1.7.5

---
 misc/requirements/requirements-pylint.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index cab15c497..346fa4227 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -8,7 +8,7 @@ idna==2.6
 isort==4.2.15
 lazy-object-proxy==1.3.1
 mccabe==0.6.1
-pylint==1.7.4
+pylint==1.7.5
 ./scripts/dev/pylint_checkers
 requests==2.18.4
 six==1.11.0

From 5d8e3a969f59c0484bb7f45087166e728b4467d1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 11 Dec 2017 16:23:16 +0100
Subject: [PATCH 151/322] Update cheroot from 5.10.0 to 6.0.0

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 46905f497..62ea92c3c 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -2,7 +2,7 @@
 
 attrs==17.3.0
 beautifulsoup4==4.6.0
-cheroot==5.10.0
+cheroot==6.0.0
 click==6.7
 # colorama==0.3.9
 coverage==4.4.2

From 22fe42d38ea76f261aea69e8c8d961517af18b03 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 11 Dec 2017 16:23:18 +0100
Subject: [PATCH 152/322] Update hypothesis from 3.40.1 to 3.42.1

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 62ea92c3c..439267282 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -11,7 +11,7 @@ fields==5.0.0
 Flask==0.12.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.40.1
+hypothesis==3.42.1
 itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7

From d57a81a3d347975c7cb16a6194261ae320a9b5ad Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 11 Dec 2017 16:23:19 +0100
Subject: [PATCH 153/322] Update pytest from 3.3.0 to 3.3.1

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 439267282..bfb8a5ea3 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -21,7 +21,7 @@ parse-type==0.4.2
 pluggy==0.6.0
 py==1.5.2
 py-cpuinfo==3.3.0
-pytest==3.3.0
+pytest==3.3.1
 pytest-bdd==2.19.0
 pytest-benchmark==3.1.1
 pytest-cov==2.5.1

From d114deac70d50b843291b9d3cfafe122e7afef34 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 11 Dec 2017 16:23:21 +0100
Subject: [PATCH 154/322] Update werkzeug from 0.12.2 to 0.13

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index bfb8a5ea3..bf80acee7 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -36,4 +36,4 @@ pytest-xvfb==1.0.0
 PyVirtualDisplay==0.2.1
 six==1.11.0
 vulture==0.26
-Werkzeug==0.12.2
+Werkzeug==0.13

From 481dec067dda7bf6f5a8df783568e7f7ee14923f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 11 Dec 2017 17:38:12 +0100
Subject: [PATCH 155/322] Don't override background-color for qutebrowser pages

Fixes #3381
---
 qutebrowser/html/base.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qutebrowser/html/base.html b/qutebrowser/html/base.html
index f21eb227b..6db182908 100644
--- a/qutebrowser/html/base.html
+++ b/qutebrowser/html/base.html
@@ -10,7 +10,6 @@ vim: ft=html fileencoding=utf-8 sts=4 sw=4 et:
         <style type="text/css">
             {% block style %}
             body {
-                background-color: #fff;
                 margin: 0;
                 padding: 0;
             }

From 747a9bc5b6dfc566c02e4616e5a3002dbe42a95f Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Mon, 11 Dec 2017 21:32:55 +0000
Subject: [PATCH 156/322] Modify usage of re.match to fit re.fullmatch or
 re.search.

re.match features an implicit left anchor, which can be surprising.

re.fullmatch features implicit anchors on both sides, but is aptly named
and unsurprising.

re.search has no such implicit anchors, which ought to be the default
even if a single anchor is needed.
---
 qutebrowser/browser/downloads.py       |  2 +-
 qutebrowser/browser/webengine/spell.py |  2 +-
 qutebrowser/config/configtypes.py      | 10 +++++-----
 qutebrowser/keyinput/basekeyparser.py  |  3 ++-
 qutebrowser/misc/crashdialog.py        |  2 +-
 qutebrowser/misc/keyhintwidget.py      |  2 +-
 qutebrowser/utils/debug.py             |  2 +-
 qutebrowser/utils/docutils.py          |  2 +-
 qutebrowser/utils/urlutils.py          |  4 ++--
 qutebrowser/utils/utils.py             |  2 +-
 10 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index 5a2daae7e..dc0d83cbc 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -180,7 +180,7 @@ def transform_path(path):
     path = utils.expand_windows_drive(path)
     # Drive dependent working directories are not supported, e.g.
     # E:filename is invalid
-    if re.match(r'[A-Z]:[^\\]', path, re.IGNORECASE):
+    if re.fullmatch(r'[A-Z]:[^\\]', path, re.IGNORECASE):
         return None
     # Paths like COM1, ...
     # See https://github.com/qutebrowser/qutebrowser/issues/82
diff --git a/qutebrowser/browser/webengine/spell.py b/qutebrowser/browser/webengine/spell.py
index ee2fb7813..9166180d4 100644
--- a/qutebrowser/browser/webengine/spell.py
+++ b/qutebrowser/browser/webengine/spell.py
@@ -30,7 +30,7 @@ from qutebrowser.utils import log
 def version(filename):
     """Extract the version number from the dictionary file name."""
     version_re = re.compile(r".+-(?P<version>[0-9]+-[0-9]+?)\.bdic")
-    match = version_re.match(filename)
+    match = version_re.fullmatch(filename)
     if match is None:
         raise ValueError('the given dictionary file name is malformed: {}'
                          .format(filename))
diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py
index 8d0af173b..320798f6b 100644
--- a/qutebrowser/config/configtypes.py
+++ b/qutebrowser/config/configtypes.py
@@ -963,7 +963,7 @@ class Font(BaseType):
     # Gets set when the config is initialized.
     monospace_fonts = None
     font_regex = re.compile(r"""
-        ^(
+        (
             (
                 # style
                 (?P<style>normal|italic|oblique) |
@@ -976,14 +976,14 @@ class Font(BaseType):
                 (?P<size>[0-9]+((\.[0-9]+)?[pP][tT]|[pP][xX]))
             )\           # size/weight/style are space-separated
         )*               # 0-inf size/weight/style tags
-        (?P<family>.+)$  # mandatory font family""", re.VERBOSE)
+        (?P<family>.+)  # mandatory font family""", re.VERBOSE)
 
     def to_py(self, value):
         self._basic_py_validation(value, str)
         if not value:
             return None
 
-        if not self.font_regex.match(value):  # pragma: no cover
+        if not self.font_regex.fullmatch(value):  # pragma: no cover
             # This should never happen, as the regex always matches everything
             # as family.
             raise configexc.ValidationError(value, "must be a valid font")
@@ -1002,7 +1002,7 @@ class FontFamily(Font):
         if not value:
             return None
 
-        match = self.font_regex.match(value)
+        match = self.font_regex.fullmatch(value)
         if not match:  # pragma: no cover
             # This should never happen, as the regex always matches everything
             # as family.
@@ -1039,7 +1039,7 @@ class QtFont(Font):
         font.setStyle(QFont.StyleNormal)
         font.setWeight(QFont.Normal)
 
-        match = self.font_regex.match(value)
+        match = self.font_regex.fullmatch(value)
         if not match:  # pragma: no cover
             # This should never happen, as the regex always matches everything
             # as family.
diff --git a/qutebrowser/keyinput/basekeyparser.py b/qutebrowser/keyinput/basekeyparser.py
index 14efd00ab..658b52d2d 100644
--- a/qutebrowser/keyinput/basekeyparser.py
+++ b/qutebrowser/keyinput/basekeyparser.py
@@ -150,7 +150,8 @@ class BaseKeyParser(QObject):
             A (count, command) tuple.
         """
         if self._supports_count:
-            (countstr, cmd_input) = re.match(r'^(\d*)(.*)', keystring).groups()
+            (countstr, cmd_input) = re.fullmatch(r'(\d*)(.*)',
+                                                 keystring).groups()
             count = int(countstr) if countstr else None
             if count == 0 and not cmd_input:
                 cmd_input = keystring
diff --git a/qutebrowser/misc/crashdialog.py b/qutebrowser/misc/crashdialog.py
index 54827211a..9ef0e573c 100644
--- a/qutebrowser/misc/crashdialog.py
+++ b/qutebrowser/misc/crashdialog.py
@@ -62,7 +62,7 @@ def parse_fatal_stacktrace(text):
         r'(Current )?[Tt]hread [^ ]* \(most recent call first\): *',
         r'  File ".*", line \d+ in (?P<func>.*)',
     ]
-    m = re.match('\n'.join(lines), text)
+    m = re.search('\n'.join(lines), text)
     if m is None:
         # We got some invalid text.
         return ('', '')
diff --git a/qutebrowser/misc/keyhintwidget.py b/qutebrowser/misc/keyhintwidget.py
index 98dc8e275..46d1d3f24 100644
--- a/qutebrowser/misc/keyhintwidget.py
+++ b/qutebrowser/misc/keyhintwidget.py
@@ -87,7 +87,7 @@ class KeyHintView(QLabel):
         Args:
             prefix: The current partial keystring.
         """
-        countstr, prefix = re.match(r'^(\d*)(.*)', prefix).groups()
+        countstr, prefix = re.fullmatch(r'(\d*)(.*)', prefix).groups()
         if not prefix:
             self._show_timer.stop()
             self.hide()
diff --git a/qutebrowser/utils/debug.py b/qutebrowser/utils/debug.py
index 2c86e1142..44699efa1 100644
--- a/qutebrowser/utils/debug.py
+++ b/qutebrowser/utils/debug.py
@@ -184,7 +184,7 @@ def signal_name(sig):
     Return:
         The cleaned up signal name.
     """
-    m = re.match(r'[0-9]+(.*)\(.*\)', sig.signal)
+    m = re.fullmatch(r'[0-9]+(.*)\(.*\)', sig.signal)
     return m.group(1)
 
 
diff --git a/qutebrowser/utils/docutils.py b/qutebrowser/utils/docutils.py
index d645b41ac..e54effe8d 100644
--- a/qutebrowser/utils/docutils.py
+++ b/qutebrowser/utils/docutils.py
@@ -156,7 +156,7 @@ class DocstringParser:
     def _parse_arg_inside(self, line):
         """Parse subsequent argument lines."""
         argname = self._cur_arg_name
-        if re.match(r'^[A-Z][a-z]+:$', line):
+        if re.fullmatch(r'[A-Z][a-z]+:', line):
             if not self.arg_descs[argname][-1].strip():
                 self.arg_descs[argname] = self.arg_descs[argname][:-1]
                 return True
diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py
index 93c41cec8..50b1632d0 100644
--- a/qutebrowser/utils/urlutils.py
+++ b/qutebrowser/utils/urlutils.py
@@ -306,7 +306,7 @@ def qurl_from_user_input(urlstr):
     """
     # First we try very liberally to separate something like an IPv6 from the
     # rest (e.g. path info or parameters)
-    match = re.match(r'\[?([0-9a-fA-F:.]+)\]?(.*)', urlstr.strip())
+    match = re.fullmatch(r'\[?([0-9a-fA-F:.]+)\]?(.*)', urlstr.strip())
     if match:
         ipstr, rest = match.groups()
     else:
@@ -571,7 +571,7 @@ def incdec_number(url, incdec, count=1, segments=None):
             continue
 
         # Get the last number in a string
-        match = re.match(r'(.*\D|^)(0*)(\d+)(.*)', getter())
+        match = re.fullmatch(r'(.*\D|^)(0*)(\d+)(.*)', getter())
         if not match:
             continue
 
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index 8debc6688..efd2b2cc8 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -869,7 +869,7 @@ def expand_windows_drive(path):
     # E:\. The correct way to specifify drive E: is "E:\", but most users
     # probably don't use the "multiple working directories" feature and expect
     # "E:" and "E:\" to be equal.
-    if re.match(r'[A-Z]:$', path, re.IGNORECASE):
+    if re.fullmatch(r'[A-Z]:', path, re.IGNORECASE):
         return path + "\\"
     else:
         return path

From f74832328f23fa71e73067e086887bb14cf0ae65 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Mon, 11 Dec 2017 23:06:52 +0000
Subject: [PATCH 157/322] Modify re.match usage in scripts directory.

---
 scripts/asciidoc2html.py   | 6 +++---
 scripts/dev/run_vulture.py | 2 +-
 scripts/dictcli.py         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/asciidoc2html.py b/scripts/asciidoc2html.py
index ce29becc0..bd51b27ef 100755
--- a/scripts/asciidoc2html.py
+++ b/scripts/asciidoc2html.py
@@ -154,17 +154,17 @@ class AsciiDoc:
                     hidden = False
                 elif line == "The Compiler <mail@qutebrowser.org>\n":
                     continue
-                elif re.match(r'^:\w+:.*', line):
+                elif re.fullmatch(r':\w+:.*', line):
                     # asciidoc field
                     continue
 
                 if not found_title:
-                    if re.match(r'^=+$', line):
+                    if re.fullmatch(r'=+', line):
                         line = line.replace('=', '-')
                         found_title = True
                         title = last_line.rstrip('\n') + " | qutebrowser\n"
                         title += "=" * (len(title) - 1)
-                    elif re.match(r'^= .+', line):
+                    elif re.fullmatch(r'= .+', line):
                         line = '==' + line[1:]
                         found_title = True
                         title = last_line.rstrip('\n') + " | qutebrowser\n"
diff --git a/scripts/dev/run_vulture.py b/scripts/dev/run_vulture.py
index 9d21ad428..11cfce792 100755
--- a/scripts/dev/run_vulture.py
+++ b/scripts/dev/run_vulture.py
@@ -132,7 +132,7 @@ def filter_func(item):
         True if the missing function should be filtered/ignored, False
         otherwise.
     """
-    return bool(re.match(r'[a-z]+[A-Z][a-zA-Z]+', item.name))
+    return bool(re.fullmatch(r'[a-z]+[A-Z][a-zA-Z]+', item.name))
 
 
 def report(items):
diff --git a/scripts/dictcli.py b/scripts/dictcli.py
index 2742de8ad..98754d628 100755
--- a/scripts/dictcli.py
+++ b/scripts/dictcli.py
@@ -142,7 +142,7 @@ def parse_entry(entry):
     dict_re = re.compile(r"""
         (?P<filename>(?P<code>[a-z]{2}(-[A-Z]{2})?).*)\.bdic
     """, re.VERBOSE)
-    match = dict_re.match(entry['name'])
+    match = dict_re.fullmatch(entry['name'])
     if match is not None:
         return match.group('code'), match.group('filename')
     else:

From 81bfa814486204ffecaf89325ae57e0e12f300f7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 12 Dec 2017 06:45:47 +0100
Subject: [PATCH 158/322] Don't run end2end tests on macOS anymore

They are just too flaky on macOS to be useful, and I have no idea how to make
things more stable there
---
 scripts/dev/ci/travis_run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/dev/ci/travis_run.sh b/scripts/dev/ci/travis_run.sh
index b7d44968e..55ca7c11e 100644
--- a/scripts/dev/ci/travis_run.sh
+++ b/scripts/dev/ci/travis_run.sh
@@ -26,7 +26,7 @@ elif [[ $TESTENV == shellcheck ]]; then
            koalaman/shellcheck:latest "${scripts[@]}"
 else
     args=()
-    [[ $TRAVIS_OS_NAME == osx ]] && args=('--qute-bdd-webengine' '--no-xvfb')
+    [[ $TRAVIS_OS_NAME == osx ]] && args=('--qute-bdd-webengine' '--no-xvfb' 'tests/unit')
 
     tox -e "$TESTENV" -- "${args[@]}"
 fi

From 4f2f1a64940253b0eb3b387b43999483584a93ac Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 12 Dec 2017 06:57:39 +0100
Subject: [PATCH 159/322] Make sure editor test doesn't run on Windows

---
 tests/end2end/features/test_editor_bdd.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py
index 3e2b2ee8d..260197a46 100644
--- a/tests/end2end/features/test_editor_bdd.py
+++ b/tests/end2end/features/test_editor_bdd.py
@@ -26,6 +26,8 @@ import signal
 import pytest_bdd as bdd
 bdd.scenarios('editor.feature')
 
+from qutebrowser.utils import utils
+
 
 @bdd.when(bdd.parsers.parse('I set up a fake editor replacing "{text}" by '
                             '"{replacement}"'))
@@ -71,6 +73,7 @@ def set_up_editor_empty(quteproc, tmpdir):
 @bdd.when(bdd.parsers.parse('I set up a fake editor that waits'))
 def set_up_editor_wait(quteproc, tmpdir):
     """Set up editor.command to a small python script inserting a text."""
+    assert not utils.is_windows
     pidfile = tmpdir / 'editor_pid'
     script = tmpdir / 'script.py'
     script.write(textwrap.dedent("""

From 12f6304659f3ef83a0a206fdb5c0fdb296a2b1a7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 12 Dec 2017 07:03:48 +0100
Subject: [PATCH 160/322] Fix indent

---
 qutebrowser/misc/guiprocess.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/misc/guiprocess.py b/qutebrowser/misc/guiprocess.py
index 4b74a512d..4fb887de0 100644
--- a/qutebrowser/misc/guiprocess.py
+++ b/qutebrowser/misc/guiprocess.py
@@ -102,7 +102,7 @@ class GUIProcess(QObject):
         stdout = bytes(self._proc.readAllStandardOutput()).decode('utf-8')
 
         qutescheme.spawn_output = self._spawn_format(code, status,
-                                                    stdout, stderr)
+                                                     stdout, stderr)
 
         if status == QProcess.CrashExit:
             message.error("{} crashed!".format(self._what.capitalize()))

From 5a97e79099683e59c0ab99d9ba84fbd6e595220a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 12 Dec 2017 07:05:55 +0100
Subject: [PATCH 161/322] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index fddb3f6a5..72dc695dd 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -57,6 +57,7 @@ Added
   when restoring a session.
 - New `hist_importer.py` script to import history from Firefox/Chromium.
 - New `{protocol}` replacement for `tabs.title.format` and friends.
+- New `-o` flag for `:spawn` to show stdout/stderr in a new tab.
 
 Changed
 ~~~~~~~

From 6655793e6abdb6e0bbd016cff58236c89715f577 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 12 Dec 2017 09:33:34 +0100
Subject: [PATCH 162/322] Use 'terminate' to clean up webserver subprocess

We already have TestProcess.terminate which does exactly the same
WebserverProcess.cleanup does.

See #3384
---
 tests/end2end/fixtures/webserver.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/tests/end2end/fixtures/webserver.py b/tests/end2end/fixtures/webserver.py
index 85a6af070..a40c62015 100644
--- a/tests/end2end/fixtures/webserver.py
+++ b/tests/end2end/fixtures/webserver.py
@@ -172,11 +172,6 @@ class WebserverProcess(testprocess.Process):
     def _default_args(self):
         return [str(self.port)]
 
-    def cleanup(self):
-        """Clean up and shut down the process."""
-        self.proc.terminate()
-        self.proc.waitForFinished()
-
 
 @pytest.fixture(scope='session', autouse=True)
 def server(qapp):
@@ -184,7 +179,7 @@ def server(qapp):
     server = WebserverProcess('webserver_sub')
     server.start()
     yield server
-    server.cleanup()
+    server.terminate()
 
 
 @pytest.fixture(autouse=True)
@@ -208,4 +203,4 @@ def ssl_server(request, qapp):
     server.start()
     yield server
     server.after_test()
-    server.cleanup()
+    server.terminate()

From 2e8acf482591958924587976106716000b570bee Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 12 Dec 2017 09:34:57 +0100
Subject: [PATCH 163/322] Improve terminating of test processes

There are various small changes here:

- If the process is already finished, we don't try to terminate it.
- On Windows, we use QProcess::kill instead of QProcess::terminate, as terminate
  will only work with processes which have a GUI loop.
- We assert that quitting the suprocess actually worked.

Fixes #3384
---
 tests/end2end/fixtures/testprocess.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index bc987043f..570a3125c 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -300,8 +300,16 @@ class Process(QObject):
 
     def terminate(self):
         """Clean up and shut down the process."""
-        self.proc.terminate()
-        self.proc.waitForFinished()
+        if not self.is_running():
+            return
+
+        if quteutils.is_windows:
+            self.proc.kill()
+        else:
+            self.proc.terminate()
+
+        ok = self.proc.waitForFinished()
+        assert ok
 
     def is_running(self):
         """Check if the process is currently running."""

From 5fe91c30cc0eb3b960ef1a256a302cf89996a273 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 12 Dec 2017 11:33:34 +0100
Subject: [PATCH 164/322] Fix :click-element with an ID containing
 non-alphanumeric characters

See #3201
---
 doc/changelog.asciidoc                  | 1 +
 qutebrowser/browser/webkit/webkittab.py | 5 +++++
 tests/end2end/data/click_element.html   | 1 +
 tests/end2end/features/misc.feature     | 5 +++++
 4 files changed, 12 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 72dc695dd..8095f1bd8 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -119,6 +119,7 @@ Fixed
 - Fixed crash when closing the tab an external editor was opened in.
 - When using `:search-next` before a search is finished, no warning about no
   results being found is shown anymore.
+- Fix :click-element with an ID containing non-alphanumeric characters.
 
 Deprecated
 ~~~~~~~~~~
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 43bec3456..f16beb7fe 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -19,6 +19,7 @@
 
 """Wrapper over our (QtWebKit) WebView."""
 
+import re
 import functools
 import xml.etree.ElementTree
 
@@ -545,6 +546,10 @@ class WebKitElements(browsertab.AbstractElements):
                 callback(None)
             else:
                 callback(elems[0])
+
+        # Escape non-alphanumeric characters in the selector
+        # https://www.w3.org/TR/CSS2/syndata.html#value-def-identifier
+        elem_id = re.sub(r'[^a-zA-Z0-9_-]', r'\\\g<0>', elem_id)
         self.find_css('#' + elem_id, find_id_cb)
 
     def find_focused(self, callback):
diff --git a/tests/end2end/data/click_element.html b/tests/end2end/data/click_element.html
index 55bf8b88c..acf0cf77c 100644
--- a/tests/end2end/data/click_element.html
+++ b/tests/end2end/data/click_element.html
@@ -9,5 +9,6 @@
         <span>Duplicate</span>
         <form><input id='qute-input'></input></form>
         <a href="/data/hello.txt" id='link'>link</a>
+        <span id='foo.bar' onclick='console.log("id with dot")'>ID with dot</span>
     </body>
 </html>
diff --git a/tests/end2end/features/misc.feature b/tests/end2end/features/misc.feature
index 70505c1f8..82ae8cf91 100644
--- a/tests/end2end/features/misc.feature
+++ b/tests/end2end/features/misc.feature
@@ -449,6 +449,11 @@ Feature: Various utility commands.
         And I run :click-element id qute-input
         Then "Entering mode KeyMode.insert (reason: clicking input)" should be logged
 
+    Scenario: Clicking an element by ID with dot
+        When I open data/click_element.html
+        And I run :click-element id foo.bar
+        Then the javascript message "id with dot" should be logged
+
     Scenario: Clicking an element with tab target
         When I open data/click_element.html
         And I run :tab-only

From 6a20f9d4c9bcce45c4fb17727b85de8f76096d94 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Tue, 12 Dec 2017 07:37:31 -0500
Subject: [PATCH 165/322] Cache url query when possible.

We don't need to regenerate a new query every keystroke, but rather
every time the user adds a new word.
---
 qutebrowser/completion/models/histcategory.py | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/completion/models/histcategory.py b/qutebrowser/completion/models/histcategory.py
index 03ddb5ff8..da1e1b8ab 100644
--- a/qutebrowser/completion/models/histcategory.py
+++ b/qutebrowser/completion/models/histcategory.py
@@ -36,6 +36,7 @@ class HistoryCategory(QSqlQueryModel):
         """Create a new History completion category."""
         super().__init__(parent=parent)
         self.name = "History"
+        self._query = None
 
         # advertise that this model filters by URL and title
         self.columns_to_filter = [0, 1]
@@ -82,15 +83,16 @@ class HistoryCategory(QSqlQueryModel):
         timefmt = ("strftime('{}', last_atime, 'unixepoch', 'localtime')"
                    .format(timestamp_format.replace("'", "`")))
 
-        self._query = sql.Query(' '.join([
-            "SELECT url, title, {}".format(timefmt),
-            "FROM CompletionHistory",
-            # the incoming pattern will have literal % and _ escaped with '\'
-            # we need to tell sql to treat '\' as an escape character
-            'WHERE ({})'.format(wheres),
-            self._atime_expr(),
-            "ORDER BY last_atime DESC",
-        ]), forward_only=False)
+        if not self._query or len(wheres) != len(self._query.boundValues()):
+            self._query = sql.Query(' '.join([
+                "SELECT url, title, {}".format(timefmt),
+                "FROM CompletionHistory",
+                # the incoming pattern will have literal % and _ escaped
+                # we need to tell sql to treat '\' as an escape character
+                'WHERE ({})'.format(wheres),
+                self._atime_expr(),
+                "ORDER BY last_atime DESC",
+            ]), forward_only=False)
 
         with debug.log_time('sql', 'Running completion query'):
             self._query.run(**{

From b07a4c8c2864d1ab54fdb4e58f36144e92eb0f8e Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 12 Dec 2017 13:25:35 +0000
Subject: [PATCH 166/322] Add explicit left anchor to directory check regex.

---
 qutebrowser/browser/downloads.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index dc0d83cbc..354e74c9b 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -180,7 +180,7 @@ def transform_path(path):
     path = utils.expand_windows_drive(path)
     # Drive dependent working directories are not supported, e.g.
     # E:filename is invalid
-    if re.fullmatch(r'[A-Z]:[^\\]', path, re.IGNORECASE):
+    if re.search(r'^[A-Z]:[^\\]', path, re.IGNORECASE):
         return None
     # Paths like COM1, ...
     # See https://github.com/qutebrowser/qutebrowser/issues/82

From dadf6c0e0a0bec393918a27047c267873c957c3d Mon Sep 17 00:00:00 2001
From: ykgmfq <16083673+ykgmfq@users.noreply.github.com>
Date: Tue, 12 Dec 2017 15:53:17 +0100
Subject: [PATCH 167/322] Fedora instructions for non-free codecs

---
 doc/install.asciidoc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/install.asciidoc b/doc/install.asciidoc
index 312e53176..1adff6636 100644
--- a/doc/install.asciidoc
+++ b/doc/install.asciidoc
@@ -101,6 +101,18 @@ qutebrowser is available in the official repositories:
 However, note that Fedora 25/26 won't be updated to qutebrowser v1.0, so you
 might want to <<tox,install qutebrowser via tox>> instead there.
 
+Additional hints
+~~~~~~~~~~~~~~~~
+
+Fedora only ships free software in the repositories.
+To be able to play videos with proprietary codecs with QtWebEngine, you will
+need to install an additional package from the RPM Fusion Free repository.
+For more information see https://rpmfusion.org/Configuration.
+
+-----
+# dnf install qt5-qtwebengine-freeworld
+-----
+
 On Archlinux
 ------------
 

From 9ca6baca4f624e99e76eae39b1bfe306525d1750 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 12 Dec 2017 15:07:37 +0000
Subject: [PATCH 168/322] Modify instances of re.match to fullmatch or search.

This applies the changes to the tests directory only.
---
 tests/end2end/conftest.py             | 4 ++--
 tests/end2end/fixtures/quteprocess.py | 2 +-
 tests/end2end/fixtures/testprocess.py | 2 +-
 tests/unit/misc/test_checkpyver.py    | 4 ++--
 tests/unit/utils/test_debug.py        | 4 ++--
 tests/unit/utils/test_utils.py        | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py
index b2f7b1484..7f80d6acb 100644
--- a/tests/end2end/conftest.py
+++ b/tests/end2end/conftest.py
@@ -74,7 +74,7 @@ def _get_version_tag(tag):
         (?P<version>\d+\.\d+(\.\d+)?)
     """, re.VERBOSE)
 
-    match = version_re.match(tag)
+    match = version_re.fullmatch(tag)
     if not match:
         return None
 
@@ -125,7 +125,7 @@ def _get_dictionary_tag(tag):
         (?P<event>must_have_dict|cannot_have_dict)=(?P<dict>[a-z]{2}-[A-Z]{2})
     """, re.VERBOSE)
 
-    match = dict_re.match(tag)
+    match = dict_re.fullmatch(tag)
     if not match:
         return None
 
diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index a0b48ab4b..7accddc03 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -48,7 +48,7 @@ def is_ignored_qt_message(message):
     """Check if the message is listed in qt_log_ignore."""
     regexes = pytest.config.getini('qt_log_ignore')
     for regex in regexes:
-        if re.match(regex, message):
+        if re.search(regex, message):
             return True
     return False
 
diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index 570a3125c..eb7123388 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -335,7 +335,7 @@ class Process(QObject):
         if expected is None:
             return True
         elif isinstance(expected, regex_type):
-            return expected.match(value)
+            return expected.fullmatch(value)
         elif isinstance(value, (bytes, str)):
             return utils.pattern_match(pattern=expected, value=value)
         else:
diff --git a/tests/unit/misc/test_checkpyver.py b/tests/unit/misc/test_checkpyver.py
index 6487eb263..b61fadc59 100644
--- a/tests/unit/misc/test_checkpyver.py
+++ b/tests/unit/misc/test_checkpyver.py
@@ -44,7 +44,7 @@ def test_python2():
         pytest.skip("python2 not found")
     assert not proc.stdout
     stderr = proc.stderr.decode('utf-8')
-    assert re.match(TEXT, stderr), stderr
+    assert re.fullmatch(TEXT, stderr), stderr
     assert proc.returncode == 1
 
 
@@ -64,7 +64,7 @@ def test_patched_no_errwindow(capfd, monkeypatch):
     checkpyver.check_python_version()
     stdout, stderr = capfd.readouterr()
     assert not stdout
-    assert re.match(TEXT, stderr), stderr
+    assert re.fullmatch(TEXT, stderr), stderr
 
 
 def test_patched_errwindow(capfd, mocker, monkeypatch):
diff --git a/tests/unit/utils/test_debug.py b/tests/unit/utils/test_debug.py
index e32f564c8..b7b5cf3ca 100644
--- a/tests/unit/utils/test_debug.py
+++ b/tests/unit/utils/test_debug.py
@@ -90,8 +90,8 @@ class TestLogTime:
 
             assert len(caplog.records) == 1
 
-            pattern = re.compile(r'^Foobar took ([\d.]*) seconds\.$')
-            match = pattern.match(caplog.records[0].msg)
+            pattern = re.compile(r'Foobar took ([\d.]*) seconds\.')
+            match = pattern.fullmatch(caplog.records[0].msg)
             assert match
 
             duration = float(match.group(1))
diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py
index f6eef7f4f..66f5e852d 100644
--- a/tests/unit/utils/test_utils.py
+++ b/tests/unit/utils/test_utils.py
@@ -863,7 +863,7 @@ class TestOpenFile:
         cmdline = '{} -c pass'.format(executable)
         utils.open_file('/foo/bar', cmdline)
         result = caplog.records[0].message
-        assert re.match(
+        assert re.fullmatch(
             r'Opening /foo/bar with \[.*python.*/foo/bar.*\]', result)
 
     @pytest.mark.not_frozen
@@ -872,7 +872,7 @@ class TestOpenFile:
         cmdline = '{} -c pass {{}} raboof'.format(executable)
         utils.open_file('/foo/bar', cmdline)
         result = caplog.records[0].message
-        assert re.match(
+        assert re.fullmatch(
             r"Opening /foo/bar with \[.*python.*/foo/bar.*'raboof'\]", result)
 
     @pytest.mark.not_frozen
@@ -882,7 +882,7 @@ class TestOpenFile:
         config_stub.val.downloads.open_dispatcher = cmdline
         utils.open_file('/foo/bar')
         result = caplog.records[1].message
-        assert re.match(
+        assert re.fullmatch(
             r"Opening /foo/bar with \[.*python.*/foo/bar.*\]", result)
 
     def test_system_default_application(self, caplog, config_stub, mocker):
@@ -890,7 +890,7 @@ class TestOpenFile:
                          new_callable=mocker.Mock)
         utils.open_file('/foo/bar')
         result = caplog.records[0].message
-        assert re.match(
+        assert re.fullmatch(
             r"Opening /foo/bar with the system application", result)
         m.assert_called_with(QUrl('file:///foo/bar'))
 

From c1094b66609ff9e750560cf4f24651e1992806a8 Mon Sep 17 00:00:00 2001
From: Justin Partain <justinwpartain1@gmail.com>
Date: Thu, 26 Oct 2017 09:16:56 -0400
Subject: [PATCH 169/322] Feature - incremental_search

Added config option to find on a page incrementally, renewing the search
each time a new character is entered.
---
 qutebrowser/config/configdata.yml           |  5 +++++
 qutebrowser/mainwindow/statusbar/command.py | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 1318e8979..4843ad7c8 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -43,6 +43,11 @@ ignore_case:
   default: smart
   desc: When to find text on a page case-insensitively.
 
+incremental_search:
+  type: Bool
+  default: False
+  desc: Find text on a page incrementally, renewing the search for each typing character.
+
 new_instance_open_target:
   type:
     name: String
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index af2dc3dc9..1a42001c4 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -26,7 +26,8 @@ from qutebrowser.keyinput import modeman, modeparsers
 from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.misc import cmdhistory, editor
 from qutebrowser.misc import miscwidgets as misc
-from qutebrowser.utils import usertypes, log, objreg, message
+from qutebrowser.utils import usertypes, log, objreg
+from qutebrowser.config import config
 
 
 class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
@@ -45,6 +46,7 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         update_completion: Emitted when the completion should be shown/updated.
         show_cmd: Emitted when command input should be shown.
         hide_cmd: Emitted when command input can be hidden.
+        update_search: Emitted when search term could be updated.
     """
 
     got_cmd = pyqtSignal([str], [str, int])
@@ -53,6 +55,7 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
     update_completion = pyqtSignal()
     show_cmd = pyqtSignal()
     hide_cmd = pyqtSignal()
+    update_search = pyqtSignal()
 
     def __init__(self, *, win_id, private, parent=None):
         misc.CommandLineEdit.__init__(self, parent=parent)
@@ -66,6 +69,8 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         self.cursorPositionChanged.connect(self.update_completion)
         self.textChanged.connect(self.update_completion)
         self.textChanged.connect(self.updateGeometry)
+        self.textChanged.connect(self.update_search)
+        self.update_search.connect(self.incrementSearch)
 
     def prefix(self):
         """Get the currently entered command prefix."""
@@ -238,3 +243,13 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
             text = 'x'
         width = self.fontMetrics().width(text)
         return QSize(width, height)
+
+    def incrementSearch(self):
+        if config.val.incremental_search == True:
+            search_prefixes = {
+                '/': 'search -- ',
+                '?': 'search -r -- ',
+            }
+            if self.prefix() == '/' or self.prefix() == '?':
+                text = self.text()
+                self.got_cmd[str].emit(search_prefixes[text[0]] + text[1:])

From 77054cc063793644de415109ebb0a7d6a76ef95a Mon Sep 17 00:00:00 2001
From: Justin Partain <justinwpartain1@gmail.com>
Date: Thu, 26 Oct 2017 09:18:34 -0400
Subject: [PATCH 170/322] Make 'Text not found on page!' warnings replace

---
 qutebrowser/browser/commands.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 3075a24da..8ba3a6f35 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1749,7 +1749,8 @@ class CommandDispatcher:
             elif going_up and tab.scroller.pos_px().y() > old_scroll_pos.y():
                 message.info("Search hit TOP, continuing at BOTTOM")
         else:
-            message.warning("Text '{}' not found on page!".format(text))
+            message.warning("Text '{}' not found on page!".format(text),
+                    replace=True)
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        maxsplit=0)

From bb2fcddcd44d818ea30daa59bb9d9dacf506d669 Mon Sep 17 00:00:00 2001
From: Justin Partain <justinwpartain1@gmail.com>
Date: Thu, 26 Oct 2017 10:17:40 -0400
Subject: [PATCH 171/322] Update incremental_search PR with changes from review

---
 qutebrowser/browser/commands.py             |  2 +-
 qutebrowser/config/configdata.yml           |  2 +-
 qutebrowser/mainwindow/statusbar/command.py | 15 +++++++--------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 8ba3a6f35..c85302c46 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1750,7 +1750,7 @@ class CommandDispatcher:
                 message.info("Search hit TOP, continuing at BOTTOM")
         else:
             message.warning("Text '{}' not found on page!".format(text),
-                    replace=True)
+                replace=True)
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        maxsplit=0)
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 4843ad7c8..58d3ea0d7 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -45,7 +45,7 @@ ignore_case:
 
 incremental_search:
   type: Bool
-  default: False
+  default: True
   desc: Find text on a page incrementally, renewing the search for each typing character.
 
 new_instance_open_target:
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 1a42001c4..106c2597f 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -46,7 +46,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         update_completion: Emitted when the completion should be shown/updated.
         show_cmd: Emitted when command input should be shown.
         hide_cmd: Emitted when command input can be hidden.
-        update_search: Emitted when search term could be updated.
     """
 
     got_cmd = pyqtSignal([str], [str, int])
@@ -55,7 +54,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
     update_completion = pyqtSignal()
     show_cmd = pyqtSignal()
     hide_cmd = pyqtSignal()
-    update_search = pyqtSignal()
 
     def __init__(self, *, win_id, private, parent=None):
         misc.CommandLineEdit.__init__(self, parent=parent)
@@ -69,8 +67,7 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         self.cursorPositionChanged.connect(self.update_completion)
         self.textChanged.connect(self.update_completion)
         self.textChanged.connect(self.updateGeometry)
-        self.textChanged.connect(self.update_search)
-        self.update_search.connect(self.incrementSearch)
+        self.textChanged.connect(self._incremental_search)
 
     def prefix(self):
         """Get the currently entered command prefix."""
@@ -244,12 +241,14 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         width = self.fontMetrics().width(text)
         return QSize(width, height)
 
-    def incrementSearch(self):
-        if config.val.incremental_search == True:
+    @pyqtSlot(str)
+    def _incremental_search(self, text):
+        if config.val.incremental_search:
             search_prefixes = {
                 '/': 'search -- ',
                 '?': 'search -r -- ',
             }
-            if self.prefix() == '/' or self.prefix() == '?':
-                text = self.text()
+
+            # len(text) check is for when user presses <Esc>
+            if self.prefix() in '/?' and len(text) != 0:
                 self.got_cmd[str].emit(search_prefixes[text[0]] + text[1:])

From 4eebd2a85d0172eec130b661b8d1dbb945514eda Mon Sep 17 00:00:00 2001
From: Justin Partain <justinwpartain1@gmail.com>
Date: Thu, 26 Oct 2017 10:50:02 -0400
Subject: [PATCH 172/322] Create config.search.* group with ignore_case and
 incremental

---
 qutebrowser/browser/commands.py             | 2 +-
 qutebrowser/config/configdata.yml           | 6 +++---
 qutebrowser/mainwindow/statusbar/command.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index c85302c46..ec84522c2 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1770,7 +1770,7 @@ class CommandDispatcher:
             return
 
         options = {
-            'ignore_case': config.val.ignore_case,
+            'ignore_case': config.val.search.ignore_case,
             'reverse': reverse,
         }
 
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 58d3ea0d7..ab77024a4 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -33,7 +33,7 @@ history_gap_interval:
     Items with less time between them are grouped when being displayed in
     `:history`. Use -1 to disable separation.
 
-ignore_case:
+search.ignore_case:
   type:
     name: String
     valid_values:
@@ -43,10 +43,10 @@ ignore_case:
   default: smart
   desc: When to find text on a page case-insensitively.
 
-incremental_search:
+search.incremental:
   type: Bool
   default: True
-  desc: Find text on a page incrementally, renewing the search for each typing character.
+  desc: Find text on a page incrementally, renewing the search for each typed character.
 
 new_instance_open_target:
   type:
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 106c2597f..ebe48a050 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -243,7 +243,7 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
 
     @pyqtSlot(str)
     def _incremental_search(self, text):
-        if config.val.incremental_search:
+        if config.val.search.incremental:
             search_prefixes = {
                 '/': 'search -- ',
                 '?': 'search -r -- ',

From 8451899a7687b63d80483efe60d530e97226f0f6 Mon Sep 17 00:00:00 2001
From: Justin Partain <justinwpartain1@gmail.com>
Date: Thu, 26 Oct 2017 12:03:11 -0400
Subject: [PATCH 173/322] Add  block for ignore_case

---
 qutebrowser/config/configdata.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index ab77024a4..15be675ae 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -33,6 +33,9 @@ history_gap_interval:
     Items with less time between them are grouped when being displayed in
     `:history`. Use -1 to disable separation.
 
+ignore_case:
+  renamed: search.ignore_case
+
 search.ignore_case:
   type:
     name: String

From 9f511fe18c25343bb0b5f8a0bc064b32ca997663 Mon Sep 17 00:00:00 2001
From: Justin Partain <justinwpartain1@gmail.com>
Date: Thu, 26 Oct 2017 13:00:07 -0400
Subject: [PATCH 174/322] pylint fix, change if len(text) to if text

---
 qutebrowser/mainwindow/statusbar/command.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index ebe48a050..5fcb3bee9 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -249,6 +249,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
                 '?': 'search -r -- ',
             }
 
-            # len(text) check is for when user presses <Esc>
-            if self.prefix() in '/?' and len(text) != 0:
+            # `if text` check is for when user presses <Esc> and `len(text)` is 0
+            if self.prefix() in '/?' and text:
                 self.got_cmd[str].emit(search_prefixes[text[0]] + text[1:])

From bcd9d13684e45cf3adc90bebe6d3b1654696fbbc Mon Sep 17 00:00:00 2001
From: Justin Partain <justinwpartain1@gmail.com>
Date: Fri, 27 Oct 2017 08:49:22 -0400
Subject: [PATCH 175/322] Update tests to use search.ignore_case

---
 tests/end2end/features/qutescheme.feature | 14 +++++-----
 tests/end2end/features/search.feature     | 34 +++++++++++------------
 tests/end2end/test_invocations.py         |  6 ++--
 tests/unit/config/test_configcommands.py  |  5 ++--
 tests/unit/config/test_configdata.py      |  2 +-
 5 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/tests/end2end/features/qutescheme.feature b/tests/end2end/features/qutescheme.feature
index 1f13a8ac1..755c103e7 100644
--- a/tests/end2end/features/qutescheme.feature
+++ b/tests/end2end/features/qutescheme.feature
@@ -99,19 +99,19 @@ Feature: Special qute:// pages
     # qute://settings
 
     Scenario: Focusing input fields in qute://settings and entering valid value
-        When I set ignore_case to never
+        When I set search.ignore_case to never
         And I open qute://settings
         # scroll to the right - the table does not fit in the default screen
         And I run :scroll-to-perc -x 100
-        And I run :jseval document.getElementById('input-ignore_case').value = ''
-        And I run :click-element id input-ignore_case
+        And I run :jseval document.getElementById('input-search.ignore_case').value = ''
+        And I run :click-element id input-search.ignore_case
         And I wait for "Entering mode KeyMode.insert *" in the log
         And I press the keys "always"
         And I press the key "<Escape>"
         # an explicit Tab to unfocus the input field seems to stabilize the tests
         And I press the key "<Tab>"
-        And I wait for "Config option changed: ignore_case *" in the log
-        Then the option ignore_case should be set to always
+        And I wait for "Config option changed: search.ignore_case *" in the log
+        Then the option search.ignore_case should be set to always
 
     # Sometimes, an unrelated value gets set
     @flaky
@@ -119,8 +119,8 @@ Feature: Special qute:// pages
         When I open qute://settings
         # scroll to the right - the table does not fit in the default screen
         And I run :scroll-to-perc -x 100
-        And I run :jseval document.getElementById('input-ignore_case').value = ''
-        And I run :click-element id input-ignore_case
+        And I run :jseval document.getElementById('input-search.ignore_case').value = ''
+        And I run :click-element id input-search.ignore_case
         And I wait for "Entering mode KeyMode.insert *" in the log
         And I press the keys "foo"
         And I press the key "<Escape>"
diff --git a/tests/end2end/features/search.feature b/tests/end2end/features/search.feature
index 56fcca207..d1a00b5b6 100644
--- a/tests/end2end/features/search.feature
+++ b/tests/end2end/features/search.feature
@@ -22,7 +22,7 @@ Feature: Searching on a page
         Then "Bar" should be found
 
     Scenario: Searching with --reverse
-        When I set ignore_case to always
+        When I set search.ignore_case to always
         And I run :search -r foo
         And I wait for "search found foo with flags FindBackward" in the log
         Then "Foo" should be found
@@ -52,28 +52,28 @@ Feature: Searching on a page
         And I wait for "search didn't find blub" in the log
         Then the warning "Text 'blub' not found on page!" should be shown
 
-    ## ignore_case
+    ## search.ignore_case
 
-    Scenario: Searching text with ignore_case = always
-        When I set ignore_case to always
+    Scenario: Searching text with search.ignore_case = always
+        When I set search.ignore_case to always
         And I run :search bar
         And I wait for "search found bar" in the log
         Then "Bar" should be found
 
-    Scenario: Searching text with ignore_case = never
-        When I set ignore_case to never
+    Scenario: Searching text with search.ignore_case = never
+        When I set search.ignore_case to never
         And I run :search bar
         And I wait for "search found bar with flags FindCaseSensitively" in the log
         Then "bar" should be found
 
-    Scenario: Searching text with ignore_case = smart (lower-case)
-        When I set ignore_case to smart
+    Scenario: Searching text with search.ignore_case = smart (lower-case)
+        When I set search.ignore_case to smart
         And I run :search bar
         And I wait for "search found bar" in the log
         Then "Bar" should be found
 
-    Scenario: Searching text with ignore_case = smart (upper-case)
-        When I set ignore_case to smart
+    Scenario: Searching text with search.ignore_case = smart (upper-case)
+        When I set search.ignore_case to smart
         And I run :search Foo
         And I wait for "search found Foo with flags FindCaseSensitively" in the log
         Then "Foo" should be found  # even though foo was first
@@ -81,7 +81,7 @@ Feature: Searching on a page
     ## :search-next
 
     Scenario: Jumping to next match
-        When I set ignore_case to always
+        When I set search.ignore_case to always
         And I run :search foo
         And I wait for "search found foo" in the log
         And I run :search-next
@@ -89,7 +89,7 @@ Feature: Searching on a page
         Then "Foo" should be found
 
     Scenario: Jumping to next match with count
-        When I set ignore_case to always
+        When I set search.ignore_case to always
         And I run :search baz
         And I wait for "search found baz" in the log
         And I run :search-next with count 2
@@ -97,7 +97,7 @@ Feature: Searching on a page
         Then "BAZ" should be found
 
     Scenario: Jumping to next match with --reverse
-        When I set ignore_case to always
+        When I set search.ignore_case to always
         And I run :search --reverse foo
         And I wait for "search found foo with flags FindBackward" in the log
         And I run :search-next
@@ -121,7 +121,7 @@ Feature: Searching on a page
 
     # https://github.com/qutebrowser/qutebrowser/issues/2438
     Scenario: Jumping to next match after clearing
-        When I set ignore_case to always
+        When I set search.ignore_case to always
         And I run :search foo
         And I wait for "search found foo" in the log
         And I run :search
@@ -132,7 +132,7 @@ Feature: Searching on a page
     ## :search-prev
 
     Scenario: Jumping to previous match
-        When I set ignore_case to always
+        When I set search.ignore_case to always
         And I run :search foo
         And I wait for "search found foo" in the log
         And I run :search-next
@@ -142,7 +142,7 @@ Feature: Searching on a page
         Then "foo" should be found
 
     Scenario: Jumping to previous match with count
-        When I set ignore_case to always
+        When I set search.ignore_case to always
         And I run :search baz
         And I wait for "search found baz" in the log
         And I run :search-next
@@ -154,7 +154,7 @@ Feature: Searching on a page
         Then "baz" should be found
 
     Scenario: Jumping to previous match with --reverse
-        When I set ignore_case to always
+        When I set search.ignore_case to always
         And I run :search --reverse foo
         And I wait for "search found foo with flags FindBackward" in the log
         And I run :search-next
diff --git a/tests/end2end/test_invocations.py b/tests/end2end/test_invocations.py
index dc9486142..ef4808718 100644
--- a/tests/end2end/test_invocations.py
+++ b/tests/end2end/test_invocations.py
@@ -359,14 +359,14 @@ def test_qute_settings_persistence(short_tmpdir, request, quteproc_new):
     args = _base_args(request.config) + ['--basedir', str(short_tmpdir)]
     quteproc_new.start(args)
     quteproc_new.open_path(
-        'qute://settings/set?option=ignore_case&value=always')
-    assert quteproc_new.get_setting('ignore_case') == 'always'
+        'qute://settings/set?option=search.ignore_case&value=always')
+    assert quteproc_new.get_setting('search.ignore_case') == 'always'
 
     quteproc_new.send_cmd(':quit')
     quteproc_new.wait_for_quit()
 
     quteproc_new.start(args)
-    assert quteproc_new.get_setting('ignore_case') == 'always'
+    assert quteproc_new.get_setting('search.ignore_case') == 'always'
 
 
 @pytest.mark.no_xvfb
diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index 7137f50db..4c0c833a1 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -281,7 +281,7 @@ class TestSource:
     def test_config_source(self, tmpdir, commands, config_stub, config_tmpdir,
                            use_default_dir, clear):
         assert config_stub.val.content.javascript.enabled
-        config_stub.val.ignore_case = 'always'
+        config_stub.val.search.ignore_case = 'always'
 
         if use_default_dir:
             pyfile = config_tmpdir / 'config.py'
@@ -295,7 +295,8 @@ class TestSource:
         commands.config_source(arg, clear=clear)
 
         assert not config_stub.val.content.javascript.enabled
-        assert config_stub.val.ignore_case == ('smart' if clear else 'always')
+        ignore_case = config_stub.val.search.ignore_case
+        assert ignore_case == ('smart' if clear else 'always')
 
     def test_errors(self, commands, config_tmpdir):
         pyfile = config_tmpdir / 'config.py'
diff --git a/tests/unit/config/test_configdata.py b/tests/unit/config/test_configdata.py
index 7edb1b0d6..b7e960ac6 100644
--- a/tests/unit/config/test_configdata.py
+++ b/tests/unit/config/test_configdata.py
@@ -34,7 +34,7 @@ def test_init(config_stub):
     # configdata.init() is called by config_stub
     config_stub.val.aliases = {}
     assert isinstance(configdata.DATA, dict)
-    assert 'ignore_case' in configdata.DATA
+    assert 'search.ignore_case' in configdata.DATA
 
 
 def test_data(config_stub):

From aff6510e35c730321e78bfc40f86b3a8210eab31 Mon Sep 17 00:00:00 2001
From: Justin Partain <justinwpartain1@gmail.com>
Date: Fri, 27 Oct 2017 08:49:53 -0400
Subject: [PATCH 176/322] Refactor _incremental_search() based on PR review

---
 qutebrowser/mainwindow/statusbar/command.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 5fcb3bee9..cddd3b953 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -243,12 +243,13 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
 
     @pyqtSlot(str)
     def _incremental_search(self, text):
-        if config.val.search.incremental:
-            search_prefixes = {
-                '/': 'search -- ',
-                '?': 'search -r -- ',
-            }
+        if not config.val.search.incremental:
+            return
 
-            # `if text` check is for when user presses <Esc> and `len(text)` is 0
-            if self.prefix() in '/?' and text:
-                self.got_cmd[str].emit(search_prefixes[text[0]] + text[1:])
+        search_prefixes = {
+            '/': 'search -- ',
+            '?': 'search -r -- ',
+        }
+
+        if self.prefix() in ['/', '?']:
+            self.got_cmd[str].emit(search_prefixes[text[0]] + text[1:])

From 8f5394934f9c0cabaa4711d3658c33a5e51dfa33 Mon Sep 17 00:00:00 2001
From: Justin Partain <justinwpartain1@gmail.com>
Date: Tue, 12 Dec 2017 11:32:52 -0500
Subject: [PATCH 177/322] Fix bad merge when rebasing incremental_search
 feature

---
 qutebrowser/mainwindow/statusbar/command.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index cddd3b953..8ae4fd566 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -26,7 +26,7 @@ from qutebrowser.keyinput import modeman, modeparsers
 from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.misc import cmdhistory, editor
 from qutebrowser.misc import miscwidgets as misc
-from qutebrowser.utils import usertypes, log, objreg
+from qutebrowser.utils import usertypes, log, objreg, message
 from qutebrowser.config import config
 
 

From 4844a68bfca3ef66f4b44c9611ecac9e9a7b6062 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 12 Dec 2017 21:42:10 +0000
Subject: [PATCH 178/322] Change a rogue re.fullmatch into a re.search.

Sometimes tests were timing out. Perhaps with fullmatch these tests were
rarely failing to parse the logs for the information.
---
 tests/end2end/fixtures/testprocess.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index eb7123388..7836ab79a 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -335,7 +335,7 @@ class Process(QObject):
         if expected is None:
             return True
         elif isinstance(expected, regex_type):
-            return expected.fullmatch(value)
+            return expected.search(value)
         elif isinstance(value, (bytes, str)):
             return utils.pattern_match(pattern=expected, value=value)
         else:

From 19596e3104da0369fe03c0568b3978ebae0637f3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 12 Dec 2017 22:24:37 +0100
Subject: [PATCH 179/322] Make qute://log lines darker

---
 qutebrowser/html/log.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/html/log.html b/qutebrowser/html/log.html
index 4e5b28069..c14dd2b7e 100644
--- a/qutebrowser/html/log.html
+++ b/qutebrowser/html/log.html
@@ -16,7 +16,7 @@ body {
 }
 
 table {
-    border: 1px solid grey;
+    border: 1px solid #222;
     border-collapse: collapse;
 }
 
@@ -25,7 +25,7 @@ pre {
 }
 
 th, td {
-    border: 1px solid grey;
+    border: 1px solid #222;
     padding-left: 5px;
     padding-right: 5px;
 }

From 16a99487590b6b19dc06569f18ffadc70c78dcf3 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 12 Dec 2017 22:23:33 +0000
Subject: [PATCH 180/322] Replace malformed utf-8 characters in spawn output.

Previously this simply crashed if there was ever malformed utf-8 in the
stderr or stdout streams, perhaps as a result of an incorrectly spawned
command. See e.g. #3222
---
 qutebrowser/misc/guiprocess.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/misc/guiprocess.py b/qutebrowser/misc/guiprocess.py
index 4fb887de0..a0a8ad639 100644
--- a/qutebrowser/misc/guiprocess.py
+++ b/qutebrowser/misc/guiprocess.py
@@ -98,8 +98,10 @@ class GUIProcess(QObject):
         log.procs.debug("Process finished with code {}, status {}.".format(
             code, status))
 
-        stderr = bytes(self._proc.readAllStandardError()).decode('utf-8')
-        stdout = bytes(self._proc.readAllStandardOutput()).decode('utf-8')
+        stderr = bytes(self._proc.readAllStandardError()).decode('utf-8',
+                                                                 'replace')
+        stdout = bytes(self._proc.readAllStandardOutput()).decode('utf-8',
+                                                                  'replace')
 
         qutescheme.spawn_output = self._spawn_format(code, status,
                                                      stdout, stderr)

From 158cfa1194807f566756ebf14f6df4c674f548d9 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Tue, 12 Dec 2017 17:28:38 -0500
Subject: [PATCH 181/322] Clean up "any order" SQL query code.

- Replace a list with a generator
- Add commments to the less obvious parts
- Simplify the binding variable names
---
 qutebrowser/completion/models/histcategory.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/completion/models/histcategory.py b/qutebrowser/completion/models/histcategory.py
index da1e1b8ab..95d905208 100644
--- a/qutebrowser/completion/models/histcategory.py
+++ b/qutebrowser/completion/models/histcategory.py
@@ -74,9 +74,12 @@ class HistoryCategory(QSqlQueryModel):
         pattern = pattern.replace('_', '\\_')
         words = ['%{}%'.format(w) for w in pattern.split(' ')]
 
-        wheres = ' AND '.join([
-            "(url || title) LIKE :pat{} escape '\\'".format(i)
-            for i in range(len(words))])
+        # build a where clause to match all of the words in any order
+        # given the search term "a b", the WHERE clause would be:
+        # ((url || title) like '%a%') AND ((url || title) LIKE '%b')
+        wheres = ' AND '.join(
+            "(url || title) LIKE :{} escape '\\'".format(i)
+            for i in range(len(words)))
 
         # replace ' in timestamp-format to avoid breaking the query
         timestamp_format = config.val.completion.timestamp_format
@@ -84,6 +87,8 @@ class HistoryCategory(QSqlQueryModel):
                    .format(timestamp_format.replace("'", "`")))
 
         if not self._query or len(wheres) != len(self._query.boundValues()):
+            # if the number of words changed, we need to generate a new query
+            # otherwise, we can reuse the prepared query for performance
             self._query = sql.Query(' '.join([
                 "SELECT url, title, {}".format(timefmt),
                 "FROM CompletionHistory",
@@ -96,7 +101,7 @@ class HistoryCategory(QSqlQueryModel):
 
         with debug.log_time('sql', 'Running completion query'):
             self._query.run(**{
-                'pat{}'.format(i): w for i, w in enumerate(words)})
+                str(i): w for i, w in enumerate(words)})
         self.setQuery(self._query)
 
     def removeRows(self, row, _count, _parent=None):

From 8358c76f869c7c2c02134975445326a948f230d2 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Tue, 12 Dec 2017 20:26:30 -0500
Subject: [PATCH 182/322] Fix casing of LIKE in comment

---
 qutebrowser/completion/models/histcategory.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/completion/models/histcategory.py b/qutebrowser/completion/models/histcategory.py
index 95d905208..554f7f7f0 100644
--- a/qutebrowser/completion/models/histcategory.py
+++ b/qutebrowser/completion/models/histcategory.py
@@ -76,7 +76,7 @@ class HistoryCategory(QSqlQueryModel):
 
         # build a where clause to match all of the words in any order
         # given the search term "a b", the WHERE clause would be:
-        # ((url || title) like '%a%') AND ((url || title) LIKE '%b')
+        # ((url || title) LIKE '%a%') AND ((url || title) LIKE '%b')
         wheres = ' AND '.join(
             "(url || title) LIKE :{} escape '\\'".format(i)
             for i in range(len(words)))

From ae294e92ad7a48b7d209ae831c9aba5432356427 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Tue, 12 Dec 2017 20:27:06 -0500
Subject: [PATCH 183/322] Remove unused re import

---
 qutebrowser/completion/models/histcategory.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/qutebrowser/completion/models/histcategory.py b/qutebrowser/completion/models/histcategory.py
index 554f7f7f0..6ec203787 100644
--- a/qutebrowser/completion/models/histcategory.py
+++ b/qutebrowser/completion/models/histcategory.py
@@ -19,8 +19,6 @@
 
 """A completion category that queries the SQL History store."""
 
-import re
-
 from PyQt5.QtSql import QSqlQueryModel
 
 from qutebrowser.misc import sql

From bea71ed3a20c21a588b25add8a7c1bbeb4834eb0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 13 Dec 2017 08:41:29 +0100
Subject: [PATCH 184/322] Remove :session-save --quiet test

When nothing gets logged, we can't check whether the session was already saved.
---
 tests/end2end/features/sessions.feature | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/end2end/features/sessions.feature b/tests/end2end/features/sessions.feature
index 5ec6e168a..429c4974e 100644
--- a/tests/end2end/features/sessions.feature
+++ b/tests/end2end/features/sessions.feature
@@ -277,11 +277,6 @@ Feature: Saving and loading sessions
     Then the message "Saved session session_name." should be shown
     And the session session_name should exist
 
-  Scenario: Saving session with --quiet
-    When I run :session-save --quiet quiet_session
-    Then "Saved session quiet_session." should not be logged
-    And the session quiet_session should exist
-
   Scenario: Saving session with --only-active-window
     When I open data/numbers/1.txt
     And I open data/numbers/2.txt in a new tab

From 4caf2fd8b71e8ea1fc50eafb85e83afe5e3e772b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 13 Dec 2017 09:27:25 +0100
Subject: [PATCH 185/322] Update changelog

---
 doc/changelog.asciidoc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 8095f1bd8..87c115b71 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -58,14 +58,17 @@ Added
 - New `hist_importer.py` script to import history from Firefox/Chromium.
 - New `{protocol}` replacement for `tabs.title.format` and friends.
 - New `-o` flag for `:spawn` to show stdout/stderr in a new tab.
+- Support for incremental search, with a new `search.incremental` setting.
 
 Changed
 ~~~~~~~
 
-- Some tabs settings got renamed:
+- Some settings got renamed:
   * `tabs.width.bar` -> `tabs.width`
   * `tabs.width.indicator` -> `tabs.indicator.width`
   * `tabs.indicator_padding` -> `tabs.indicator.padding`
+  * `session_default_name` -> `session.default_name`
+  * `ignore_case` -> `search.ignore_case`
 - High-DPI favicons are now used when available.
 - The `asciidoc2html.py` script now uses Pygments (which is already a dependency
   of qutebrowser) instead of `source-highlight` for syntax highlighting.

From 28961ab177d9d70109b58f9dc741232328d089c3 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Wed, 13 Dec 2017 12:46:46 +0000
Subject: [PATCH 186/322] Add a test with invalid unicode in spawned stdout.

stderr features identical behaviour, so is currently untested.
---
 tests/unit/misc/test_guiprocess.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/unit/misc/test_guiprocess.py b/tests/unit/misc/test_guiprocess.py
index 25e46476e..473016b52 100644
--- a/tests/unit/misc/test_guiprocess.py
+++ b/tests/unit/misc/test_guiprocess.py
@@ -63,6 +63,20 @@ def test_start(proc, qtbot, message_mock, py_proc):
     assert qutescheme.spawn_output == proc._spawn_format(stdout="test")
 
 
+def test_stdout_malformed_utf8(proc, qtbot, message_mock, py_proc):
+    """Test simply starting a process."""
+    with qtbot.waitSignals([proc.started, proc.finished], timeout=10000,
+                           order='strict'):
+        argv = py_proc(r"""
+            import sys
+            sys.stdout.buffer.write(b"A\x80B")
+            sys.exit(0)
+            """)
+        proc.start(*argv)
+    assert not message_mock.messages
+    assert qutescheme.spawn_output == proc._spawn_format(stdout="A\ufffdB")
+
+
 def test_start_verbose(proc, qtbot, message_mock, py_proc):
     """Test starting a process verbosely."""
     proc.verbose = True

From 2e36e5151e122550d58bab500cfbe9a34027a077 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Wed, 13 Dec 2017 08:21:48 -0500
Subject: [PATCH 187/322] Fix comment in histcategory.

---
 qutebrowser/completion/models/histcategory.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/completion/models/histcategory.py b/qutebrowser/completion/models/histcategory.py
index 6ec203787..7db6ca902 100644
--- a/qutebrowser/completion/models/histcategory.py
+++ b/qutebrowser/completion/models/histcategory.py
@@ -74,7 +74,7 @@ class HistoryCategory(QSqlQueryModel):
 
         # build a where clause to match all of the words in any order
         # given the search term "a b", the WHERE clause would be:
-        # ((url || title) LIKE '%a%') AND ((url || title) LIKE '%b')
+        # ((url || title) LIKE '%a%') AND ((url || title) LIKE '%b%')
         wheres = ' AND '.join(
             "(url || title) LIKE :{} escape '\\'".format(i)
             for i in range(len(words)))

From 6420037dd9afbb6aaf09fd669e11b543be06f0eb Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Wed, 13 Dec 2017 08:39:34 -0500
Subject: [PATCH 188/322] Fix histcategory query reuse logic.

I mistakenly checked the length of wheres instead of words. This fixes
that check, renames 'wheres' to 'where_clause' to be clear
that it is a string and not an array, and adds a test.
---
 qutebrowser/completion/models/histcategory.py |  6 ++--
 tests/unit/completion/test_histcategory.py    | 32 +++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/completion/models/histcategory.py b/qutebrowser/completion/models/histcategory.py
index 7db6ca902..57a2aa936 100644
--- a/qutebrowser/completion/models/histcategory.py
+++ b/qutebrowser/completion/models/histcategory.py
@@ -75,7 +75,7 @@ class HistoryCategory(QSqlQueryModel):
         # build a where clause to match all of the words in any order
         # given the search term "a b", the WHERE clause would be:
         # ((url || title) LIKE '%a%') AND ((url || title) LIKE '%b%')
-        wheres = ' AND '.join(
+        where_clause = ' AND '.join(
             "(url || title) LIKE :{} escape '\\'".format(i)
             for i in range(len(words)))
 
@@ -84,7 +84,7 @@ class HistoryCategory(QSqlQueryModel):
         timefmt = ("strftime('{}', last_atime, 'unixepoch', 'localtime')"
                    .format(timestamp_format.replace("'", "`")))
 
-        if not self._query or len(wheres) != len(self._query.boundValues()):
+        if not self._query or len(words) != len(self._query.boundValues()):
             # if the number of words changed, we need to generate a new query
             # otherwise, we can reuse the prepared query for performance
             self._query = sql.Query(' '.join([
@@ -92,7 +92,7 @@ class HistoryCategory(QSqlQueryModel):
                 "FROM CompletionHistory",
                 # the incoming pattern will have literal % and _ escaped
                 # we need to tell sql to treat '\' as an escape character
-                'WHERE ({})'.format(wheres),
+                'WHERE ({})'.format(where_clause),
                 self._atime_expr(),
                 "ORDER BY last_atime DESC",
             ]), forward_only=False)
diff --git a/tests/unit/completion/test_histcategory.py b/tests/unit/completion/test_histcategory.py
index 8458c3311..e42f9b91f 100644
--- a/tests/unit/completion/test_histcategory.py
+++ b/tests/unit/completion/test_histcategory.py
@@ -93,6 +93,38 @@ def test_set_pattern(pattern, before, after, model_validator, hist):
     model_validator.validate(after)
 
 
+def test_set_pattern_repeated(model_validator, hist):
+    """Validate multiple subsequent calls to set_pattern."""
+    hist.insert({'url': 'example.com/foo', 'title': 'title1', 'last_atime': 1})
+    hist.insert({'url': 'example.com/bar', 'title': 'title2', 'last_atime': 1})
+    hist.insert({'url': 'example.com/baz', 'title': 'title3', 'last_atime': 1})
+    cat = histcategory.HistoryCategory()
+    model_validator.set_model(cat)
+
+    cat.set_pattern('b')
+    model_validator.validate([
+        ('example.com/bar', 'title2'),
+        ('example.com/baz', 'title3'),
+    ])
+
+    cat.set_pattern('ba')
+    model_validator.validate([
+        ('example.com/bar', 'title2'),
+        ('example.com/baz', 'title3'),
+    ])
+
+    cat.set_pattern('ba ')
+    model_validator.validate([
+        ('example.com/bar', 'title2'),
+        ('example.com/baz', 'title3'),
+    ])
+
+    cat.set_pattern('ba z')
+    model_validator.validate([
+        ('example.com/baz', 'title3'),
+    ])
+
+
 @pytest.mark.parametrize('max_items, before, after', [
     (-1, [
         ('a', 'a', '2017-04-16'),

From 84e0ce757ad3c4460b7394f3a321ae1ebc0e660c Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Wed, 13 Dec 2017 14:50:25 +0000
Subject: [PATCH 189/322] Fix erroneous docstring in a recently added test.

---
 tests/unit/misc/test_guiprocess.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/misc/test_guiprocess.py b/tests/unit/misc/test_guiprocess.py
index 473016b52..b74b0383a 100644
--- a/tests/unit/misc/test_guiprocess.py
+++ b/tests/unit/misc/test_guiprocess.py
@@ -64,7 +64,7 @@ def test_start(proc, qtbot, message_mock, py_proc):
 
 
 def test_stdout_malformed_utf8(proc, qtbot, message_mock, py_proc):
-    """Test simply starting a process."""
+    """Test handling malformed utf-8 in stdout."""
     with qtbot.waitSignals([proc.started, proc.finished], timeout=10000,
                            order='strict'):
         argv = py_proc(r"""

From afb080706495ac37963ce0cdb2fca9003122118b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 13 Dec 2017 19:58:01 +0100
Subject: [PATCH 190/322] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 87c115b71..8674be889 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -102,6 +102,8 @@ Changed
 - Search terms for URLs and titles can now be mixed when filtering the
   completion.
 - The default font size for the UI got bumped up from 8pt to 10pt.
+- Improved matching in the completion: The words entered are now matched in any
+  order, and mixed matches on URL/tite are possible.
 
 Fixed
 ~~~~~

From cdb90cbee762d4d77ae894017630bd21c5aff7b2 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 13 Dec 2017 19:59:54 +0100
Subject: [PATCH 191/322] Regenerate docs

---
 doc/help/settings.asciidoc | 39 +++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 28480486f..317ca8b65 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -199,7 +199,6 @@
 |<<hints.scatter,hints.scatter>>|Scatter hint key chains (like Vimium) or not (like dwb).
 |<<hints.uppercase,hints.uppercase>>|Make characters in hint strings uppercase.
 |<<history_gap_interval,history_gap_interval>>|Maximum time (in minutes) between two history items for them to be considered being from the same browsing session.
-|<<ignore_case,ignore_case>>|When to find text on a page case-insensitively.
 |<<input.forward_unbound_keys,input.forward_unbound_keys>>|Which unbound keys to forward to the webview in normal mode.
 |<<input.insert_mode.auto_leave,input.insert_mode.auto_leave>>|Leave insert mode if a non-editable element is clicked.
 |<<input.insert_mode.auto_load,input.insert_mode.auto_load>>|Automatically enter insert mode if an editable element is focused after loading the page.
@@ -222,6 +221,8 @@
 |<<qt.highdpi,qt.highdpi>>|Turn on Qt HighDPI scaling.
 |<<scrolling.bar,scrolling.bar>>|Show a scrollbar.
 |<<scrolling.smooth,scrolling.smooth>>|Enable smooth scrolling for web pages.
+|<<search.ignore_case,search.ignore_case>>|When to find text on a page case-insensitively.
+|<<search.incremental,search.incremental>>|Find text on a page incrementally, renewing the search for each typed character.
 |<<session.default_name,session.default_name>>|Name of the session to save by default.
 |<<session.lazy_restore,session.lazy_restore>>|Load a restored tab as soon as it takes focus.
 |<<spellcheck.languages,spellcheck.languages>>|Languages to use for spell checking.
@@ -2326,20 +2327,6 @@ Type: <<types,Int>>
 
 Default: +pass:[30]+
 
-[[ignore_case]]
-=== ignore_case
-When to find text on a page case-insensitively.
-
-Type: <<types,String>>
-
-Valid values:
-
- * +always+: Search case-insensitively.
- * +never+: Search case-sensitively.
- * +smart+: Search case-sensitively if there are capital characters.
-
-Default: +pass:[smart]+
-
 [[input.forward_unbound_keys]]
 === input.forward_unbound_keys
 Which unbound keys to forward to the webview in normal mode.
@@ -2557,6 +2544,28 @@ Type: <<types,Bool>>
 
 Default: +pass:[false]+
 
+[[search.ignore_case]]
+=== search.ignore_case
+When to find text on a page case-insensitively.
+
+Type: <<types,String>>
+
+Valid values:
+
+ * +always+: Search case-insensitively.
+ * +never+: Search case-sensitively.
+ * +smart+: Search case-sensitively if there are capital characters.
+
+Default: +pass:[smart]+
+
+[[search.incremental]]
+=== search.incremental
+Find text on a page incrementally, renewing the search for each typed character.
+
+Type: <<types,Bool>>
+
+Default: +pass:[true]+
+
 [[session.default_name]]
 === session.default_name
 Name of the session to save by default.

From 07d07c7faea57041a3a6878b7349288643dd8eec Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 13 Dec 2017 20:06:43 +0100
Subject: [PATCH 192/322] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 8674be889..3604b7498 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -125,6 +125,7 @@ Fixed
 - When using `:search-next` before a search is finished, no warning about no
   results being found is shown anymore.
 - Fix :click-element with an ID containing non-alphanumeric characters.
+- Fix crash when a subprocess outputs data which is not decodable as UTF-8.
 
 Deprecated
 ~~~~~~~~~~

From 922b1e8f109dc0f3fdb4ff03ad0cb023f10bf202 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 13 Dec 2017 20:09:56 +0100
Subject: [PATCH 193/322] Use system locale to decode subprocess output

---
 doc/changelog.asciidoc         |  2 ++
 qutebrowser/misc/guiprocess.py | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 3604b7498..7ab5b231b 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -104,6 +104,8 @@ Changed
 - The default font size for the UI got bumped up from 8pt to 10pt.
 - Improved matching in the completion: The words entered are now matched in any
   order, and mixed matches on URL/tite are possible.
+- The system's default encoding (rather than UTF-8) is now used to decode
+  subprocess output.
 
 Fixed
 ~~~~~
diff --git a/qutebrowser/misc/guiprocess.py b/qutebrowser/misc/guiprocess.py
index a0a8ad639..384c3ae30 100644
--- a/qutebrowser/misc/guiprocess.py
+++ b/qutebrowser/misc/guiprocess.py
@@ -19,6 +19,7 @@
 
 """A QProcess which shows notifications in the GUI."""
 
+import locale
 import shlex
 
 from PyQt5.QtCore import (pyqtSlot, pyqtSignal, QObject, QProcess,
@@ -98,10 +99,11 @@ class GUIProcess(QObject):
         log.procs.debug("Process finished with code {}, status {}.".format(
             code, status))
 
-        stderr = bytes(self._proc.readAllStandardError()).decode('utf-8',
-                                                                 'replace')
-        stdout = bytes(self._proc.readAllStandardOutput()).decode('utf-8',
-                                                                  'replace')
+        encoding = locale.getpreferredencoding(do_setlocale=False)
+        stderr = bytes(self._proc.readAllStandardError()).decode(
+            encoding, 'replace')
+        stdout = bytes(self._proc.readAllStandardOutput()).decode(
+            encoding, 'replace')
 
         qutescheme.spawn_output = self._spawn_format(code, status,
                                                      stdout, stderr)

From cc4e8c1aaeab545a03ab13e8cde79e6b7f0e8ca0 Mon Sep 17 00:00:00 2001
From: Kevin Velghe <kevin@paretje.be>
Date: Wed, 13 Dec 2017 21:05:44 +0100
Subject: [PATCH 194/322] fix password_fill using libsecret

---
 misc/userscripts/password_fill | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/userscripts/password_fill b/misc/userscripts/password_fill
index 5f30a6bf6..8dba68c2b 100755
--- a/misc/userscripts/password_fill
+++ b/misc/userscripts/password_fill
@@ -283,8 +283,8 @@ secret_backend() {
     query_entries() {
         local domain="$1"
         while read -r line ; do
-            if [[ "$line" == "attribute.username ="* ]] ; then
-                files+=("$domain ${line#${BASH_REMATCH[0]}}")
+            if [[ "$line" == "attribute.username = "* ]] ; then
+                files+=("$domain ${line:21}")
             fi
         done < <( secret-tool search --unlock --all domain "$domain" 2>&1 )
     }

From ddcdfa54aabb661175f7bf412c6d3055c8f5755c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 13 Dec 2017 21:12:56 +0100
Subject: [PATCH 195/322] Fix test for invalid guiprocess encoding

---
 tests/unit/misc/test_guiprocess.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/unit/misc/test_guiprocess.py b/tests/unit/misc/test_guiprocess.py
index b74b0383a..958524d42 100644
--- a/tests/unit/misc/test_guiprocess.py
+++ b/tests/unit/misc/test_guiprocess.py
@@ -69,7 +69,8 @@ def test_stdout_malformed_utf8(proc, qtbot, message_mock, py_proc):
                            order='strict'):
         argv = py_proc(r"""
             import sys
-            sys.stdout.buffer.write(b"A\x80B")
+            # Using \x81 because it's invalid in UTF-8 and CP1252
+            sys.stdout.buffer.write(b"A\x81B")
             sys.exit(0)
             """)
         proc.start(*argv)

From 0a612db733541d0158f6861af002b83317b45622 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 13 Dec 2017 21:13:47 +0100
Subject: [PATCH 196/322] Rename/move encoding test

---
 tests/unit/misc/test_guiprocess.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/unit/misc/test_guiprocess.py b/tests/unit/misc/test_guiprocess.py
index 958524d42..78c55bf98 100644
--- a/tests/unit/misc/test_guiprocess.py
+++ b/tests/unit/misc/test_guiprocess.py
@@ -63,21 +63,6 @@ def test_start(proc, qtbot, message_mock, py_proc):
     assert qutescheme.spawn_output == proc._spawn_format(stdout="test")
 
 
-def test_stdout_malformed_utf8(proc, qtbot, message_mock, py_proc):
-    """Test handling malformed utf-8 in stdout."""
-    with qtbot.waitSignals([proc.started, proc.finished], timeout=10000,
-                           order='strict'):
-        argv = py_proc(r"""
-            import sys
-            # Using \x81 because it's invalid in UTF-8 and CP1252
-            sys.stdout.buffer.write(b"A\x81B")
-            sys.exit(0)
-            """)
-        proc.start(*argv)
-    assert not message_mock.messages
-    assert qutescheme.spawn_output == proc._spawn_format(stdout="A\ufffdB")
-
-
 def test_start_verbose(proc, qtbot, message_mock, py_proc):
     """Test starting a process verbosely."""
     proc.verbose = True
@@ -239,3 +224,18 @@ def test_exit_successful_output(qtbot, proc, py_proc, stream):
             print("test", file=sys.{})
             sys.exit(0)
         """.format(stream)))
+
+
+def test_stdout_not_decodable(proc, qtbot, message_mock, py_proc):
+    """Test handling malformed utf-8 in stdout."""
+    with qtbot.waitSignals([proc.started, proc.finished], timeout=10000,
+                           order='strict'):
+        argv = py_proc(r"""
+            import sys
+            # Using \x81 because it's invalid in UTF-8 and CP1252
+            sys.stdout.buffer.write(b"A\x81B")
+            sys.exit(0)
+            """)
+        proc.start(*argv)
+    assert not message_mock.messages
+    assert qutescheme.spawn_output == proc._spawn_format(stdout="A\ufffdB")

From 12112e0fc799541a60432e9bcbfd5c959cfeeb57 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Wed, 13 Dec 2017 16:28:08 -0500
Subject: [PATCH 197/322] Implement command-accept --rapid.

command-accept --rapid will run the command without clearing the prompt,
allowing "rapid fire" commands. For example, one could open completion
for `open -t` and open several tabs in a row.

The default binding is ctrl+enter.

Resolves #588.
---
 qutebrowser/config/configdata.yml           |  1 +
 qutebrowser/mainwindow/statusbar/command.py | 12 +++++++++---
 tests/end2end/features/misc.feature         |  7 +++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 15be675ae..8778cc013 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -2307,6 +2307,7 @@ bindings.default:
       <Ctrl-C>: completion-item-yank
       <Ctrl-Shift-C>: completion-item-yank --sel
       <Return>: command-accept
+      <Ctrl-Return>: command-accept --rapid
       <Ctrl-B>: rl-backward-char
       <Ctrl-F>: rl-forward-char
       <Alt-B>: rl-backward-word
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 8ae4fd566..3e0a339a3 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -156,8 +156,12 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
 
     @cmdutils.register(instance='status-command',
                        modes=[usertypes.KeyMode.command], scope='window')
-    def command_accept(self):
-        """Execute the command currently in the commandline."""
+    def command_accept(self, rapid=False):
+        """Execute the command currently in the commandline.
+
+        Args:
+            rapid: Run the command without closing or clearing the command bar.
+        """
         prefixes = {
             ':': '',
             '/': 'search -- ',
@@ -165,7 +169,9 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         }
         text = self.text()
         self.history.append(text)
-        modeman.leave(self._win_id, usertypes.KeyMode.command, 'cmd accept')
+        if not rapid:
+            modeman.leave(self._win_id, usertypes.KeyMode.command,
+                          'cmd accept')
         self.got_cmd[str].emit(prefixes[text[0]] + text[1:])
 
     @cmdutils.register(instance='status-command', scope='window')
diff --git a/tests/end2end/features/misc.feature b/tests/end2end/features/misc.feature
index 82ae8cf91..8f21b7421 100644
--- a/tests/end2end/features/misc.feature
+++ b/tests/end2end/features/misc.feature
@@ -9,6 +9,13 @@ Feature: Various utility commands.
         And I run :command-accept
         Then the message "Hello World" should be shown
 
+    Scenario: :set-cmd-text and :command-accept --rapid
+        When I run :set-cmd-text :message-info "Hello World"
+        And I run :command-accept --rapid
+        And I run :command-accept
+        Then the message "Hello World" should be shown
+        And the message "Hello World" should be shown
+
     Scenario: :set-cmd-text with two commands
         When I run :set-cmd-text :message-info test ;; message-error error
         And I run :command-accept

From f34bdfbb50f276d398762e9200db4fe8a483932f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 13 Dec 2017 22:46:38 +0100
Subject: [PATCH 198/322] Revert "Remove :session-save --quiet test"

This reverts commit bea71ed3a20c21a588b25add8a7c1bbeb4834eb0.
I think I can think of a way to stabilize it now.
---
 tests/end2end/features/sessions.feature | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/end2end/features/sessions.feature b/tests/end2end/features/sessions.feature
index 429c4974e..5ec6e168a 100644
--- a/tests/end2end/features/sessions.feature
+++ b/tests/end2end/features/sessions.feature
@@ -277,6 +277,11 @@ Feature: Saving and loading sessions
     Then the message "Saved session session_name." should be shown
     And the session session_name should exist
 
+  Scenario: Saving session with --quiet
+    When I run :session-save --quiet quiet_session
+    Then "Saved session quiet_session." should not be logged
+    And the session quiet_session should exist
+
   Scenario: Saving session with --only-active-window
     When I open data/numbers/1.txt
     And I open data/numbers/2.txt in a new tab

From 7a3554e77a8e9a549da337ea50c08d0e74c85b04 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 13 Dec 2017 23:02:44 +0100
Subject: [PATCH 199/322] Stabilize :session-save --quiet test

By adding a way to check for the loglevel, we can easily check there's no
message but still wait for the session to be saved.
---
 qutebrowser/misc/sessions.py            |  4 +++-
 tests/end2end/features/conftest.py      | 13 ++++++++++---
 tests/end2end/features/sessions.feature |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index bfd73ef32..fcd82cda1 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -519,7 +519,9 @@ class SessionManager(QObject):
             raise cmdexc.CommandError("Error while saving session: {}"
                                       .format(e))
         else:
-            if not quiet:
+            if quiet:
+                log.sessions.debug("Saved session {}.".format(name))
+            else:
                 message.info("Saved session {}.".format(name))
 
     @cmdutils.register(instance='session-manager')
diff --git a/tests/end2end/features/conftest.py b/tests/end2end/features/conftest.py
index 7f5b4e2a6..5b97ba2a4 100644
--- a/tests/end2end/features/conftest.py
+++ b/tests/end2end/features/conftest.py
@@ -439,14 +439,21 @@ def expect_message(quteproc, server, category, message):
 
 
 @bdd.then(bdd.parsers.re(r'(?P<is_regex>regex )?"(?P<pattern>[^"]+)" should '
-                         r'be logged'))
-def should_be_logged(quteproc, server, is_regex, pattern):
+                         r'be logged( with level (?P<loglevel>.*))?'))
+def should_be_logged(quteproc, server, is_regex, pattern, loglevel):
     """Expect the given pattern on regex in the log."""
     if is_regex:
         pattern = re.compile(pattern)
     else:
         pattern = pattern.replace('(port)', str(server.port))
-    line = quteproc.wait_for(message=pattern)
+
+    args = {
+        'message': pattern,
+    }
+    if loglevel:
+        args['loglevel'] = getattr(logging, loglevel.upper())
+
+    line = quteproc.wait_for(**args)
     line.expected = True
 
 
diff --git a/tests/end2end/features/sessions.feature b/tests/end2end/features/sessions.feature
index 5ec6e168a..50054c665 100644
--- a/tests/end2end/features/sessions.feature
+++ b/tests/end2end/features/sessions.feature
@@ -279,7 +279,7 @@ Feature: Saving and loading sessions
 
   Scenario: Saving session with --quiet
     When I run :session-save --quiet quiet_session
-    Then "Saved session quiet_session." should not be logged
+    Then "Saved session quiet_session." should be logged with level debug
     And the session quiet_session should exist
 
   Scenario: Saving session with --only-active-window

From 57e2d407ceb016f273effb8841beefd8d3c1a015 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Wed, 13 Dec 2017 17:03:59 -0500
Subject: [PATCH 200/322] Support different colors per completion column.

Now colors.completion.fg may be set to a list to specify a different
color for each completion column. For example:

:set colors.completion.fg [black,blue,white] will use black text for the
first column, blue for the second, and white for the third.

Setting to a single value still works and behaves as before. The default
is unchanged from 'white'.

Resolves #1794.
---
 qutebrowser/completion/completiondelegate.py |  8 +++++---
 qutebrowser/config/configdata.yml            | 10 ++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/completion/completiondelegate.py b/qutebrowser/completion/completiondelegate.py
index 6688a2dfa..b4f9c5a33 100644
--- a/qutebrowser/completion/completiondelegate.py
+++ b/qutebrowser/completion/completiondelegate.py
@@ -138,10 +138,10 @@ class CompletionItemDelegate(QStyledItemDelegate):
 
         self._painter.translate(text_rect.left(), text_rect.top())
         self._get_textdoc(index)
-        self._draw_textdoc(text_rect)
+        self._draw_textdoc(text_rect, index.column())
         self._painter.restore()
 
-    def _draw_textdoc(self, rect):
+    def _draw_textdoc(self, rect, col):
         """Draw the QTextDocument of an item.
 
         Args:
@@ -156,7 +156,9 @@ class CompletionItemDelegate(QStyledItemDelegate):
         elif not self._opt.state & QStyle.State_Enabled:
             color = config.val.colors.completion.category.fg
         else:
-            color = config.val.colors.completion.fg
+            colors = config.val.colors.completion.fg
+            # if multiple colors are set, use different colors per column
+            color = colors[col % len(colors)]
         self._painter.setPen(color)
 
         ctx = QAbstractTextDocumentLayout.PaintContext()
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 15be675ae..6d8812c25 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1541,8 +1541,14 @@ zoom.text_only:
 
 colors.completion.fg:
   default: white
-  type: QtColor
-  desc: Text color of the completion widget.
+  type:
+    name: ListOrValue
+    valtype: QtColor
+  desc: >-
+    Text color of the completion widget.
+
+    May be a single value to specify the color for all columns, or a list
+    specifying a different color for each column.
 
 colors.completion.odd.bg:
   default: '#444444'

From 5620acb81fa2acb3660e27e872dab3f2933be3f3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 14 Dec 2017 08:59:54 +0100
Subject: [PATCH 201/322] Update Debian install instructions

[ci skip]
---
 doc/install.asciidoc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/install.asciidoc b/doc/install.asciidoc
index 1adff6636..4b1fd3f26 100644
--- a/doc/install.asciidoc
+++ b/doc/install.asciidoc
@@ -21,7 +21,7 @@ Those distributions only have Python 3.4 and a too old Qt version available,
 while qutebrowser requires Python 3.5 and Qt 5.7.1 or newer.
 
 It should be possible to install Python 3.5 e.g. from the
-https://launchpad.net/~deadsnakes/+archive/ubuntu/ppa[deadsnakes PPA] or via_ipca
+https://launchpad.net/~deadsnakes/+archive/ubuntu/ppa[deadsnakes PPA] or via
 https://github.com/pyenv/pyenv[pyenv], but nobody tried that yet.
 
 If you get qutebrowser running on those distributions, please
@@ -78,8 +78,7 @@ $ python3 scripts/asciidoc2html.py
 ----
 
 - If you prefer using QtWebKit, there's an up-to-date version available in
-  Debian experimental, or from http://repo.paretje.be/unstable/[this repository]
-  for Debian Stretch.
+  https://packages.debian.org/buster/libqt5webkit5[Debian Testing].
 - If video or sound don't work with QtWebKit, try installing the gstreamer plugins:
 +
 ----

From dce4c688279fe615b0efdb13fa993ce22310b35a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 14 Dec 2017 09:03:51 +0100
Subject: [PATCH 202/322] Update docs

---
 doc/changelog.asciidoc     | 2 ++
 doc/help/commands.asciidoc | 5 +++++
 doc/help/settings.asciidoc | 1 +
 3 files changed, 8 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 7ab5b231b..297890209 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -59,6 +59,8 @@ Added
 - New `{protocol}` replacement for `tabs.title.format` and friends.
 - New `-o` flag for `:spawn` to show stdout/stderr in a new tab.
 - Support for incremental search, with a new `search.incremental` setting.
+- New `--rapid` flag for `:command-accept` (bound to `Ctrl-Enter` by default),
+  which allows executing a command in the completion without closing it.
 
 Changed
 ~~~~~~~
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 3da81a391..370f675a8 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -1423,8 +1423,13 @@ How many steps to zoom out.
 |==============
 [[command-accept]]
 === command-accept
+Syntax: +:command-accept [*--rapid*]+
+
 Execute the command currently in the commandline.
 
+==== optional arguments
+* +*-r*+, +*--rapid*+: Run the command without closing or clearing the command bar.
+
 [[command-history-next]]
 === command-history-next
 Go forward in the commandline history.
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 317ca8b65..35c90ba61 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -427,6 +427,7 @@ Default:
 * +pass:[&lt;Ctrl-K&gt;]+: +pass:[rl-kill-line]+
 * +pass:[&lt;Ctrl-N&gt;]+: +pass:[command-history-next]+
 * +pass:[&lt;Ctrl-P&gt;]+: +pass:[command-history-prev]+
+* +pass:[&lt;Ctrl-Return&gt;]+: +pass:[command-accept --rapid]+
 * +pass:[&lt;Ctrl-Shift-C&gt;]+: +pass:[completion-item-yank --sel]+
 * +pass:[&lt;Ctrl-Shift-Tab&gt;]+: +pass:[completion-item-focus prev-category]+
 * +pass:[&lt;Ctrl-Tab&gt;]+: +pass:[completion-item-focus next-category]+

From f0ad24b08a4d98430efde6c909152ac96112427c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 14 Dec 2017 09:06:46 +0100
Subject: [PATCH 203/322] Remove long deprecated :download invocation

---
 doc/changelog.asciidoc                   |  2 ++
 doc/help/commands.asciidoc               |  4 +---
 qutebrowser/browser/commands.py          | 15 +--------------
 tests/end2end/features/downloads.feature |  9 ---------
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 297890209..499ffaeaa 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -142,6 +142,8 @@ Removed
 
 - The long-deprecated `:prompt-yes`, `:prompt-no`, `:paste-primary` and `:paste`
   commands have been removed.
+- The invocation `:download <url> <dest>` which was deprecated in v0.5.0 was
+  removed, use `:download --dest <dest> <url>` instead.
 - The `messages.unfocused` option which wasn't used anymore was removed.
 - The `x[xtb]` default bindings got removed again as many users accidentally
   triggered them.
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 370f675a8..ed0769683 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -334,12 +334,10 @@ Write the current configuration to a config.py file.
 
 [[download]]
 === download
-Syntax: +:download [*--mhtml*] [*--dest* 'dest'] ['url'] ['dest-old']+
+Syntax: +:download [*--mhtml*] [*--dest* 'dest'] ['url']+
 
 Download a given URL, or current page if no URL given.
 
-The form `:download [url] [dest]` is deprecated, use `:download --dest [dest] [url]` instead.
-
 ==== positional arguments
 * +'url'+: The URL to download. If not given, download the current page.
 
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index ec84522c2..b9df08486 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1425,27 +1425,14 @@ class CommandDispatcher:
             raise cmdexc.CommandError(e)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
-    @cmdutils.argument('dest_old', hide=True)
-    def download(self, url=None, dest_old=None, *, mhtml_=False, dest=None):
+    def download(self, url=None, *, mhtml_=False, dest=None):
         """Download a given URL, or current page if no URL given.
 
-        The form `:download [url] [dest]` is deprecated, use `:download --dest
-        [dest] [url]` instead.
-
         Args:
             url: The URL to download. If not given, download the current page.
-            dest_old: (deprecated) Same as dest.
             dest: The file path to write the download to, or None to ask.
             mhtml_: Download the current page and all assets as mhtml file.
         """
-        if dest_old is not None:
-            message.warning(":download [url] [dest] is deprecated - use "
-                            ":download --dest [dest] [url]")
-            if dest is not None:
-                raise cmdexc.CommandError("Can't give two destinations for the"
-                                          " download.")
-            dest = dest_old
-
         # FIXME:qtwebengine do this with the QtWebEngine download manager?
         download_manager = objreg.get('qtnetwork-download-manager',
                                       scope='window', window=self._win_id)
diff --git a/tests/end2end/features/downloads.feature b/tests/end2end/features/downloads.feature
index 833f63cb4..26e3421a1 100644
--- a/tests/end2end/features/downloads.feature
+++ b/tests/end2end/features/downloads.feature
@@ -242,15 +242,6 @@ Feature: Downloading things from a website.
 
     ## Wrong invocations
 
-    Scenario: :download with deprecated dest-old argument
-        When I run :download http://localhost:(port)/ deprecated-argument
-        Then the warning ":download [url] [dest] is deprecated - use :download --dest [dest] [url]" should be shown
-
-    Scenario: Two destinations given
-        When I run :download --dest destination2 http://localhost:(port)/ destination1
-        Then the warning ":download [url] [dest] is deprecated - use :download --dest [dest] [url]" should be shown
-        And the error "Can't give two destinations for the download." should be shown
-
     Scenario: :download --mhtml with a URL given
         When I run :download --mhtml http://foobar/
         Then the error "Can only download the current page as mhtml." should be shown

From 58043b5653e50a79ca76a587d31154facc66548b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 14 Dec 2017 09:13:34 +0100
Subject: [PATCH 204/322] Always subtract scroll bar width from completion view

The situation where there's no scroll bar at the point the column widths are
calculated is a very rare one. What happens more often is that the scroll bar
disappears due to filtering, in which case we didn't recalculate the column
widths anyways.

Furthermore, we can even go wrong with this calculation, when we calculate the
column widths while the entire completion is invisible - then the scroll bar
won't be visible either, and we won't subtract the space needed for it.

Let's not try to optimize for this uncommon case, and just always subtract the
scrollbar, even if it's not there initially.

Fixes #3359
Closes #3389
---
 qutebrowser/completion/completionwidget.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/completion/completionwidget.py b/qutebrowser/completion/completionwidget.py
index 29471597f..2cfc6db7a 100644
--- a/qutebrowser/completion/completionwidget.py
+++ b/qutebrowser/completion/completionwidget.py
@@ -152,12 +152,12 @@ class CompletionView(QTreeView):
         column_widths = self.model().column_widths
         pixel_widths = [(width * perc // 100) for perc in column_widths]
 
-        if self.verticalScrollBar().isVisible():
-            delta = self.style().pixelMetric(QStyle.PM_ScrollBarExtent) + 5
-            if pixel_widths[-1] > delta:
-                pixel_widths[-1] -= delta
-            else:
-                pixel_widths[-2] -= delta
+        delta = self.style().pixelMetric(QStyle.PM_ScrollBarExtent) + 5
+        if pixel_widths[-1] > delta:
+            pixel_widths[-1] -= delta
+        else:
+            pixel_widths[-2] -= delta
+
         for i, w in enumerate(pixel_widths):
             assert w >= 0, i
             self.setColumnWidth(i, w)

From dc1d5036b6d11b7971b31345322e4e8b0c7e1c6f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 14 Dec 2017 09:39:07 +0100
Subject: [PATCH 205/322] Simplify scrollbar width calculation

This gives us slightly different values it seems, but I think they are more
correct (and don't need the "+ 5" above).

Taking the width directly (not the sizeHint width) returned values like 100 or
so when the scrollbar wasn't shown yet, so that seems wrong.
---
 qutebrowser/completion/completionwidget.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/completion/completionwidget.py b/qutebrowser/completion/completionwidget.py
index 2cfc6db7a..f1be785e1 100644
--- a/qutebrowser/completion/completionwidget.py
+++ b/qutebrowser/completion/completionwidget.py
@@ -23,7 +23,7 @@ Defines a CompletionView which uses CompletionFiterModel and CompletionModel
 subclasses to provide completions.
 """
 
-from PyQt5.QtWidgets import QStyle, QTreeView, QSizePolicy, QStyleFactory
+from PyQt5.QtWidgets import QTreeView, QSizePolicy, QStyleFactory
 from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QItemSelectionModel, QSize
 
 from qutebrowser.config import config
@@ -152,7 +152,7 @@ class CompletionView(QTreeView):
         column_widths = self.model().column_widths
         pixel_widths = [(width * perc // 100) for perc in column_widths]
 
-        delta = self.style().pixelMetric(QStyle.PM_ScrollBarExtent) + 5
+        delta = self.verticalScrollBar().sizeHint().width()
         if pixel_widths[-1] > delta:
             pixel_widths[-1] -= delta
         else:

From 76db8d6f81711f9d14bf8075ef2b237492122e50 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 14 Dec 2017 22:43:19 +0100
Subject: [PATCH 206/322] Make webelem.OrphanedError subclass of webelem.Error

This means something like this:

  :hint ;; later 20 follow-hint a ;; later 20 tab-close

Won't crash anymore, as the webelem.Error will be shown in the statusbar.
---
 qutebrowser/browser/webelem.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/webelem.py b/qutebrowser/browser/webelem.py
index 6030f2708..4a1cc02b5 100644
--- a/qutebrowser/browser/webelem.py
+++ b/qutebrowser/browser/webelem.py
@@ -60,7 +60,7 @@ class Error(Exception):
     pass
 
 
-class OrphanedError(Exception):
+class OrphanedError(Error):
 
     """Raised when a webelement's parent has vanished."""
 

From 8173a48b8a0b513688b666c0679d041925208f8c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 14 Dec 2017 22:56:44 +0100
Subject: [PATCH 207/322] Don't access stale settings object after hinting

When QtWebEngine shuts down, it calls pending callbacks, which means we access
an invalid 'settings' object when that happens. The stack would look something
like this:

0  QtWebEngineCore::WebEngineSettings::setAttribute(QtWebEngineCore::WebEngineSettings::Attribute, bool)
12 QtWebEngineCore::CallbackDirectory::invokeEmptyInternal<QVariant const&>(QtWebEnginePrivate::QWebEngineCallbackPrivateBase<QVariant const&>*)
14 QtWebEngineCore::CallbackDirectory::~CallbackDirectory()
19 QWebEnginePage::~QWebEnginePage()

If we instead get the settings from the view freshly, we get a RuntimeError from
PyQt telling us that it's dead. Not sure why it doesn't know about settings
being dead...

With that, we'd get a RuntimeError, which we can simply ignore as it doesn't
matter anyways if the tab is gone.

Fixes #3399
---
 doc/changelog.asciidoc                         |  1 +
 qutebrowser/browser/webengine/webengineelem.py | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 499ffaeaa..2fb8af4d7 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -130,6 +130,7 @@ Fixed
   results being found is shown anymore.
 - Fix :click-element with an ID containing non-alphanumeric characters.
 - Fix crash when a subprocess outputs data which is not decodable as UTF-8.
+- Fix crash when closing a tab immediately after hinting.
 
 Deprecated
 ~~~~~~~~~~
diff --git a/qutebrowser/browser/webengine/webengineelem.py b/qutebrowser/browser/webengine/webengineelem.py
index 0e54ca80e..2df19e6cd 100644
--- a/qutebrowser/browser/webengine/webengineelem.py
+++ b/qutebrowser/browser/webengine/webengineelem.py
@@ -211,11 +211,11 @@ class WebEngineElement(webelem.AbstractWebElement):
     def _click_js(self, _click_target):
         # FIXME:qtwebengine Have a proper API for this
         # pylint: disable=protected-access
-        settings = self._tab._widget.settings()
+        view = self._tab._widget
         # pylint: enable=protected-access
         attribute = QWebEngineSettings.JavascriptCanOpenWindows
-        could_open_windows = settings.testAttribute(attribute)
-        settings.setAttribute(attribute, True)
+        could_open_windows = view.settings().testAttribute(attribute)
+        view.settings().setAttribute(attribute, True)
 
         # Get QtWebEngine do apply the settings
         # (it does so with a 0ms QTimer...)
@@ -226,6 +226,11 @@ class WebEngineElement(webelem.AbstractWebElement):
                            QEventLoop.ExcludeUserInputEvents)
 
         def reset_setting(_arg):
-            settings.setAttribute(attribute, could_open_windows)
+            try:
+                view.settings().setAttribute(attribute, could_open_windows)
+            except RuntimeError:
+                # Happens if this callback gets called during QWebEnginePage
+                # destruction, i.e. if the tab was closed in the meantime.
+                pass
 
         self._js_call('click', callback=reset_setting)

From 03a339b93a8dc6a9ad68858d4583f660c7456722 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 13:42:54 +0100
Subject: [PATCH 208/322] Update pylint

---
 misc/requirements/requirements-pylint.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index 346fa4227..6267fc2b0 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-astroid==1.5.3
+astroid==1.6.0
 certifi==2017.11.5
 chardet==3.0.4
 github3.py==0.9.6
@@ -8,7 +8,7 @@ idna==2.6
 isort==4.2.15
 lazy-object-proxy==1.3.1
 mccabe==0.6.1
-pylint==1.7.5
+pylint==1.8.1
 ./scripts/dev/pylint_checkers
 requests==2.18.4
 six==1.11.0

From 3f9ded3bed7c6aafece48a9ce34322893c6a469e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 13:55:06 +0100
Subject: [PATCH 209/322] Add missing docstrings

---
 qutebrowser/browser/browsertab.py              | 2 ++
 qutebrowser/browser/commands.py                | 2 ++
 qutebrowser/browser/history.py                 | 1 +
 qutebrowser/browser/inspector.py               | 1 +
 qutebrowser/browser/network/pac.py             | 1 +
 qutebrowser/browser/qutescheme.py              | 1 +
 qutebrowser/browser/webengine/webengineelem.py | 1 +
 qutebrowser/browser/webkit/webkittab.py        | 1 +
 qutebrowser/config/config.py                   | 2 ++
 qutebrowser/keyinput/modeparsers.py            | 1 +
 qutebrowser/mainwindow/tabbedbrowser.py        | 1 +
 qutebrowser/misc/backendproblem.py             | 1 +
 qutebrowser/misc/earlyinit.py                  | 1 +
 qutebrowser/utils/debug.py                     | 1 +
 qutebrowser/utils/message.py                   | 1 +
 qutebrowser/utils/utils.py                     | 1 +
 scripts/asciidoc2html.py                       | 1 +
 scripts/dev/standardpaths_tester.py            | 1 +
 scripts/dictcli.py                             | 2 ++
 scripts/importer.py                            | 1 +
 20 files changed, 24 insertions(+)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index c8e595baf..57a3f6ba7 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -487,6 +487,7 @@ class AbstractHistory:
         raise NotImplementedError
 
     def back(self, count=1):
+        """Go back in the tab's history."""
         idx = self.current_idx() - count
         if idx >= 0:
             self._go_to_item(self._item_at(idx))
@@ -495,6 +496,7 @@ class AbstractHistory:
             raise WebTabError("At beginning of history.")
 
     def forward(self, count=1):
+        """Go forward in the tab's history."""
         idx = self.current_idx() + count
         if idx < len(self):
             self._go_to_item(self._item_at(idx))
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index b9df08486..c65df71bc 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1522,6 +1522,7 @@ class CommandDispatcher:
         dest = os.path.expanduser(dest)
 
         def callback(data):
+            """Write the data to disk."""
             try:
                 with open(dest, 'w', encoding='utf-8') as f:
                     f.write(data)
@@ -2040,6 +2041,7 @@ class CommandDispatcher:
             jseval_cb = None
         else:
             def jseval_cb(out):
+                """Show the data returned from JS."""
                 if out is None:
                     # Getting the actual error (if any) seems to be difficult.
                     # The error does end up in
diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index 1901548bf..81d1fb2f9 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -268,6 +268,7 @@ class WebHistory(sql.SqlTable):
             return
 
         def action():
+            """Actually run the import."""
             with debug.log_time(log.init, 'Import old history file to sqlite'):
                 try:
                     self._read(path)
diff --git a/qutebrowser/browser/inspector.py b/qutebrowser/browser/inspector.py
index c88242bb8..9c583f4b3 100644
--- a/qutebrowser/browser/inspector.py
+++ b/qutebrowser/browser/inspector.py
@@ -94,6 +94,7 @@ class AbstractWebInspector(QWidget):
         raise NotImplementedError
 
     def toggle(self, page):
+        """Show/hide the inspector."""
         if self._widget.isVisible():
             self.hide()
         else:
diff --git a/qutebrowser/browser/network/pac.py b/qutebrowser/browser/network/pac.py
index 69158fe62..a3f0813c8 100644
--- a/qutebrowser/browser/network/pac.py
+++ b/qutebrowser/browser/network/pac.py
@@ -59,6 +59,7 @@ def _js_slot(*args):
     def _decorator(method):
         @functools.wraps(method)
         def new_method(self, *args, **kwargs):
+            """Call the underlying function."""
             try:
                 return method(self, *args, **kwargs)
             except:
diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 32bc5806a..9cfef039a 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -113,6 +113,7 @@ class add_handler:  # noqa: N801,N806 pylint: disable=invalid-name
         return function
 
     def wrapper(self, *args, **kwargs):
+        """Call the underlying function."""
         if self._backend is not None and objects.backend != self._backend:
             return self.wrong_backend_handler(*args, **kwargs)
         else:
diff --git a/qutebrowser/browser/webengine/webengineelem.py b/qutebrowser/browser/webengine/webengineelem.py
index 2df19e6cd..d6d74ebe4 100644
--- a/qutebrowser/browser/webengine/webengineelem.py
+++ b/qutebrowser/browser/webengine/webengineelem.py
@@ -226,6 +226,7 @@ class WebEngineElement(webelem.AbstractWebElement):
                            QEventLoop.ExcludeUserInputEvents)
 
         def reset_setting(_arg):
+            """Set the JavascriptCanOpenWindows setting to its old value."""
             try:
                 view.settings().setAttribute(attribute, could_open_windows)
             except RuntimeError:
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index f16beb7fe..6b8f067fd 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -542,6 +542,7 @@ class WebKitElements(browsertab.AbstractElements):
 
     def find_id(self, elem_id, callback):
         def find_id_cb(elems):
+            """Call the real callback with the found elements."""
             if not elems:
                 callback(None)
             else:
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 7b9341343..43fb7e839 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -104,11 +104,13 @@ class change_filter:  # noqa: N801,N806 pylint: disable=invalid-name
         if self._function:
             @functools.wraps(func)
             def wrapper(option=None):
+                """Call the underlying function."""
                 if self._check_match(option):
                     return func()
         else:
             @functools.wraps(func)
             def wrapper(wrapper_self, option=None):
+                """Call the underlying function."""
                 if self._check_match(option):
                     return func(wrapper_self)
 
diff --git a/qutebrowser/keyinput/modeparsers.py b/qutebrowser/keyinput/modeparsers.py
index 40624cee6..1d74e5659 100644
--- a/qutebrowser/keyinput/modeparsers.py
+++ b/qutebrowser/keyinput/modeparsers.py
@@ -83,6 +83,7 @@ class NormalKeyParser(keyparser.CommandKeyParser):
         return match
 
     def set_inhibited_timeout(self, timeout):
+        """Ignore keypresses for the given duration."""
         if timeout != 0:
             self._debug_log("Inhibiting the normal mode for {}ms.".format(
                 timeout))
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index c78c0eced..c51a7aaff 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -818,6 +818,7 @@ class TabbedBrowser(tabwidget.TabWidget):
                 point, url = self._global_marks[key]
 
                 def callback(ok):
+                    """Scroll once loading finished."""
                     if ok:
                         self.cur_load_finished.disconnect(callback)
                         tab.scroller.to_point(point)
diff --git a/qutebrowser/misc/backendproblem.py b/qutebrowser/misc/backendproblem.py
index 6adc0c722..8a51d50ce 100644
--- a/qutebrowser/misc/backendproblem.py
+++ b/qutebrowser/misc/backendproblem.py
@@ -364,6 +364,7 @@ def _check_backend_modules():
 
 
 def init():
+    """Check for various issues related to QtWebKit/QtWebEngine."""
     _check_backend_modules()
     if objects.backend == usertypes.Backend.QtWebEngine:
         _handle_ssl_support()
diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py
index af53b73a7..9b4a6e8a5 100644
--- a/qutebrowser/misc/earlyinit.py
+++ b/qutebrowser/misc/earlyinit.py
@@ -261,6 +261,7 @@ def init_log(args):
 
 
 def check_optimize_flag():
+    """Check whether qutebrowser is running with -OO."""
     from qutebrowser.utils import log
     if sys.flags.optimize >= 2:
         log.init.warning("Running on optimize level higher than 1, "
diff --git a/qutebrowser/utils/debug.py b/qutebrowser/utils/debug.py
index 44699efa1..813b02e7a 100644
--- a/qutebrowser/utils/debug.py
+++ b/qutebrowser/utils/debug.py
@@ -266,6 +266,7 @@ class log_time:  # noqa: N801,N806 pylint: disable=invalid-name
     def __call__(self, func):
         @functools.wraps(func)
         def wrapped(*args, **kwargs):
+            """Call the original function."""
             with self:
                 func(*args, **kwargs)
 
diff --git a/qutebrowser/utils/message.py b/qutebrowser/utils/message.py
index 35ab604b0..6957f115d 100644
--- a/qutebrowser/utils/message.py
+++ b/qutebrowser/utils/message.py
@@ -216,6 +216,7 @@ class GlobalMessageBridge(QObject):
         self.ask_question.emit(question, blocking)
 
     def show(self, level, text, replace=False):
+        """Show the given message."""
         if self._connected:
             self.show_message.emit(level, text, replace)
         else:
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index efd2b2cc8..8333c4132 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -631,6 +631,7 @@ class prevent_exceptions:  # noqa: N801,N806 pylint: disable=invalid-name
 
         @functools.wraps(func)
         def wrapper(*args, **kwargs):
+            """Call the original function."""
             try:
                 return func(*args, **kwargs)
             except BaseException:
diff --git a/scripts/asciidoc2html.py b/scripts/asciidoc2html.py
index bd51b27ef..dbd4b7679 100755
--- a/scripts/asciidoc2html.py
+++ b/scripts/asciidoc2html.py
@@ -66,6 +66,7 @@ class AsciiDoc:
             shutil.rmtree(self._homedir)
 
     def build(self):
+        """Build either the website or the docs."""
         if self._args.website:
             self._build_website()
         else:
diff --git a/scripts/dev/standardpaths_tester.py b/scripts/dev/standardpaths_tester.py
index a53b0320a..1cf2fbe4f 100644
--- a/scripts/dev/standardpaths_tester.py
+++ b/scripts/dev/standardpaths_tester.py
@@ -40,6 +40,7 @@ def print_header():
 
 
 def print_paths():
+    """Print all QStandardPaths.StandardLocation members."""
     for name, obj in vars(QStandardPaths).items():
         if isinstance(obj, QStandardPaths.StandardLocation):
             location = QStandardPaths.writableLocation(obj)
diff --git a/scripts/dictcli.py b/scripts/dictcli.py
index 98754d628..201657a3c 100755
--- a/scripts/dictcli.py
+++ b/scripts/dictcli.py
@@ -233,6 +233,7 @@ def install(languages):
 
 
 def update(languages):
+    """Update the given languages."""
     installed = [lang for lang in languages if lang.local_version is not None]
     for lang in installed:
         if lang.local_version < lang.remote_version:
@@ -244,6 +245,7 @@ def update(languages):
 
 
 def remove_old(languages):
+    """Remove old versions of languages."""
     installed = [lang for lang in languages if lang.local_version is not None]
     for lang in installed:
         local_files = spell.local_files(lang.code)
diff --git a/scripts/importer.py b/scripts/importer.py
index 5f22646d6..c97188ffe 100755
--- a/scripts/importer.py
+++ b/scripts/importer.py
@@ -332,6 +332,7 @@ def import_chrome(profile, bookmark_types, output_format):
             bookmarks = json.load(f)
 
         def bm_tree_walk(bm, template):
+            """Recursive function to walk through bookmarks."""
             assert 'type' in bm, bm
             if bm['type'] == 'url':
                 if urllib.parse.urlparse(bm['url']).scheme != 'chrome':

From a4101662b2d4ee8656e7edb2a24a41a8921a68c8 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 14:29:50 +0100
Subject: [PATCH 210/322] pylint: Disable logging-not-lazy

We log to RAM anyways
---
 .pylintrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.pylintrc b/.pylintrc
index bca11bf80..241bd2d77 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -37,6 +37,7 @@ disable=no-self-use,
         duplicate-code,
         wrong-import-position,
         no-else-return,
+        logging-not-lazy,
         # https://github.com/PyCQA/pylint/issues/1698
         unsupported-membership-test,
         unsupported-assignment-operation,

From e76732693c22529e156321cae501603a8ca12024 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 14:35:07 +0100
Subject: [PATCH 211/322] Fix wrong import order

---
 qutebrowser/browser/mouse.py                    | 4 +---
 qutebrowser/browser/webkit/http.py              | 4 ++--
 qutebrowser/utils/jinja.py                      | 2 +-
 tests/end2end/conftest.py                       | 3 +--
 tests/helpers/fixtures.py                       | 9 ++++-----
 tests/unit/config/test_configfiles.py           | 3 +--
 tests/unit/keyinput/test_modeman.py             | 4 ++--
 tests/unit/misc/test_msgbox.py                  | 6 +++---
 tests/unit/misc/test_sql.py                     | 3 ++-
 tests/unit/utils/test_error.py                  | 5 ++---
 tests/unit/utils/test_log.py                    | 3 +--
 tests/unit/utils/usertypes/test_neighborlist.py | 4 ++--
 tests/unit/utils/usertypes/test_timer.py        | 4 ++--
 13 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/qutebrowser/browser/mouse.py b/qutebrowser/browser/mouse.py
index 619f75120..d08f191a8 100644
--- a/qutebrowser/browser/mouse.py
+++ b/qutebrowser/browser/mouse.py
@@ -19,15 +19,13 @@
 
 """Mouse handling for a browser tab."""
 
+from PyQt5.QtCore import QObject, QEvent, Qt, QTimer
 
 from qutebrowser.config import config
 from qutebrowser.utils import message, log, usertypes
 from qutebrowser.keyinput import modeman
 
 
-from PyQt5.QtCore import QObject, QEvent, Qt, QTimer
-
-
 class ChildEventFilter(QObject):
 
     """An event filter re-adding MouseEventFilter on ChildEvent.
diff --git a/qutebrowser/browser/webkit/http.py b/qutebrowser/browser/webkit/http.py
index 7f5173943..8997f4b0c 100644
--- a/qutebrowser/browser/webkit/http.py
+++ b/qutebrowser/browser/webkit/http.py
@@ -22,11 +22,11 @@
 
 import os.path
 
+from PyQt5.QtNetwork import QNetworkRequest
+
 from qutebrowser.utils import log
 from qutebrowser.browser.webkit import rfc6266
 
-from PyQt5.QtNetwork import QNetworkRequest
-
 
 def parse_content_disposition(reply):
     """Parse a content_disposition header.
diff --git a/qutebrowser/utils/jinja.py b/qutebrowser/utils/jinja.py
index b6f53645b..802fc5fff 100644
--- a/qutebrowser/utils/jinja.py
+++ b/qutebrowser/utils/jinja.py
@@ -28,10 +28,10 @@ import html
 
 import jinja2
 import jinja2.exceptions
+from PyQt5.QtCore import QUrl
 
 from qutebrowser.utils import utils, urlutils, log
 
-from PyQt5.QtCore import QUrl
 
 html_fallback = """
 <!DOCTYPE html>
diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py
index 7f80d6acb..309793ddc 100644
--- a/tests/end2end/conftest.py
+++ b/tests/end2end/conftest.py
@@ -29,8 +29,6 @@ import pstats
 import os.path
 import operator
 
-from qutebrowser.browser.webengine import spell
-
 import pytest
 from PyQt5.QtCore import PYQT_VERSION
 
@@ -41,6 +39,7 @@ from end2end.fixtures.quteprocess import (quteproc_process, quteproc,
                                           quteproc_new)
 from end2end.fixtures.testprocess import pytest_runtest_makereport
 from qutebrowser.utils import qtutils, utils
+from qutebrowser.browser.webengine import spell
 
 
 def pytest_configure(config):
diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py
index 5cbf01aad..715e0168d 100644
--- a/tests/helpers/fixtures.py
+++ b/tests/helpers/fixtures.py
@@ -35,6 +35,10 @@ import types
 import attr
 import pytest
 import py.path  # pylint: disable=no-name-in-module
+from PyQt5.QtCore import QEvent, QSize, Qt
+from PyQt5.QtGui import QKeyEvent
+from PyQt5.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout
+from PyQt5.QtNetwork import QNetworkCookieJar
 
 import helpers.stubs as stubsmod
 import helpers.utils
@@ -44,11 +48,6 @@ from qutebrowser.browser.webkit import cookies
 from qutebrowser.misc import savemanager, sql
 from qutebrowser.keyinput import modeman
 
-from PyQt5.QtCore import QEvent, QSize, Qt
-from PyQt5.QtGui import QKeyEvent
-from PyQt5.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout
-from PyQt5.QtNetwork import QNetworkCookieJar
-
 
 class WinRegistryHelper:
 
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 9efbc6a4e..b4e9742bc 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -24,13 +24,12 @@ import unittest.mock
 import textwrap
 
 import pytest
+from PyQt5.QtCore import QSettings
 
 from qutebrowser.config import (config, configfiles, configexc, configdata,
                                 configtypes)
 from qutebrowser.utils import utils, usertypes
 
-from PyQt5.QtCore import QSettings
-
 
 @pytest.fixture(autouse=True)
 def configdata_init():
diff --git a/tests/unit/keyinput/test_modeman.py b/tests/unit/keyinput/test_modeman.py
index d00ce09f7..5185636a6 100644
--- a/tests/unit/keyinput/test_modeman.py
+++ b/tests/unit/keyinput/test_modeman.py
@@ -19,10 +19,10 @@
 
 import pytest
 
-from qutebrowser.utils import usertypes
-
 from PyQt5.QtCore import Qt, QObject, pyqtSignal
 
+from qutebrowser.utils import usertypes
+
 
 class FakeKeyparser(QObject):
 
diff --git a/tests/unit/misc/test_msgbox.py b/tests/unit/misc/test_msgbox.py
index cab72c251..783816011 100644
--- a/tests/unit/misc/test_msgbox.py
+++ b/tests/unit/misc/test_msgbox.py
@@ -20,12 +20,12 @@
 
 import pytest
 
-from qutebrowser.misc import msgbox
-from qutebrowser.utils import utils
-
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QMessageBox, QWidget
 
+from qutebrowser.misc import msgbox
+from qutebrowser.utils import utils
+
 
 @pytest.fixture(autouse=True)
 def patch_args(fake_args):
diff --git a/tests/unit/misc/test_sql.py b/tests/unit/misc/test_sql.py
index 89c442b2b..8df08adc3 100644
--- a/tests/unit/misc/test_sql.py
+++ b/tests/unit/misc/test_sql.py
@@ -20,10 +20,11 @@
 """Test the SQL API."""
 
 import pytest
-from qutebrowser.misc import sql
 
 from PyQt5.QtSql import QSqlError
 
+from qutebrowser.misc import sql
+
 
 pytestmark = pytest.mark.usefixtures('init_sql')
 
diff --git a/tests/unit/utils/test_error.py b/tests/unit/utils/test_error.py
index 47a1c52d9..43ebc01b7 100644
--- a/tests/unit/utils/test_error.py
+++ b/tests/unit/utils/test_error.py
@@ -21,13 +21,12 @@
 import logging
 
 import pytest
+from PyQt5.QtCore import QTimer
+from PyQt5.QtWidgets import QMessageBox
 
 from qutebrowser.utils import error, utils
 from qutebrowser.misc import ipc
 
-from PyQt5.QtCore import QTimer
-from PyQt5.QtWidgets import QMessageBox
-
 
 class Error(Exception):
 
diff --git a/tests/unit/utils/test_log.py b/tests/unit/utils/test_log.py
index 2ab51002d..fb2723cc6 100644
--- a/tests/unit/utils/test_log.py
+++ b/tests/unit/utils/test_log.py
@@ -28,12 +28,11 @@ import warnings
 import attr
 import pytest
 import _pytest.logging
+from PyQt5 import QtCore
 
 from qutebrowser.utils import log
 from qutebrowser.misc import utilcmds
 
-from PyQt5 import QtCore
-
 
 @pytest.fixture(autouse=True)
 def restore_loggers():
diff --git a/tests/unit/utils/usertypes/test_neighborlist.py b/tests/unit/utils/usertypes/test_neighborlist.py
index 751f940a3..804ed51ed 100644
--- a/tests/unit/utils/usertypes/test_neighborlist.py
+++ b/tests/unit/utils/usertypes/test_neighborlist.py
@@ -19,10 +19,10 @@
 
 """Tests for the NeighborList class."""
 
-from qutebrowser.utils import usertypes
-
 import pytest
 
+from qutebrowser.utils import usertypes
+
 
 class TestInit:
 
diff --git a/tests/unit/utils/usertypes/test_timer.py b/tests/unit/utils/usertypes/test_timer.py
index d120d82e6..81ea6feae 100644
--- a/tests/unit/utils/usertypes/test_timer.py
+++ b/tests/unit/utils/usertypes/test_timer.py
@@ -19,11 +19,11 @@
 
 """Tests for Timer."""
 
-from qutebrowser.utils import usertypes
-
 import pytest
 from PyQt5.QtCore import QObject
 
+from qutebrowser.utils import usertypes
+
 
 class Parent(QObject):
 

From bb44f1d4cc3fc3fdccab2f39b2bf8f5617498775 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 14:38:30 +0100
Subject: [PATCH 212/322] Remove old pylint disables

---
 .pylintrc                             | 4 ----
 qutebrowser/browser/hints.py          | 4 ----
 qutebrowser/completion/completer.py   | 2 --
 tests/end2end/test_dirbrowser.py      | 2 --
 tests/unit/config/test_configfiles.py | 6 +-----
 5 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index 241bd2d77..a6bebec71 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -38,10 +38,6 @@ disable=no-self-use,
         wrong-import-position,
         no-else-return,
         logging-not-lazy,
-        # https://github.com/PyCQA/pylint/issues/1698
-        unsupported-membership-test,
-        unsupported-assignment-operation,
-        unsubscriptable-object,
         too-many-boolean-expressions,
         too-many-locals,
         too-many-branches,
diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index 6d40f531a..2520dd712 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -390,10 +390,8 @@ class HintManager(QObject):
 
     def _cleanup(self):
         """Clean up after hinting."""
-        # pylint: disable=not-an-iterable
         for label in self._context.all_labels:
             label.cleanup()
-        # pylint: enable=not-an-iterable
 
         text = self._get_text()
         message_bridge = objreg.get('message-bridge', scope='window',
@@ -809,7 +807,6 @@ class HintManager(QObject):
         log.hints.debug("Filtering hints on {!r}".format(filterstr))
 
         visible = []
-        # pylint: disable=not-an-iterable
         for label in self._context.all_labels:
             try:
                 if self._filter_matches(filterstr, str(label.elem)):
@@ -821,7 +818,6 @@ class HintManager(QObject):
                     label.hide()
             except webelem.Error:
                 pass
-        # pylint: enable=not-an-iterable
 
         if not visible:
             # Whoops, filtered all hints
diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py
index edb1aca97..6eb8b51c4 100644
--- a/qutebrowser/completion/completer.py
+++ b/qutebrowser/completion/completer.py
@@ -134,9 +134,7 @@ class Completer(QObject):
             return [], '', []
         parser = runners.CommandParser()
         result = parser.parse(text, fallback=True, keep=True)
-        # pylint: disable=not-an-iterable
         parts = [x for x in result.cmdline if x]
-        # pylint: enable=not-an-iterable
         pos = self._cmd.cursorPosition() - len(self._cmd.prefix())
         pos = min(pos, len(text))  # Qt treats 2-byte UTF-16 chars as 2 chars
         log.completion.debug('partitioning {} around position {}'.format(parts,
diff --git a/tests/end2end/test_dirbrowser.py b/tests/end2end/test_dirbrowser.py
index 16da8d0bc..ea92e2ca2 100644
--- a/tests/end2end/test_dirbrowser.py
+++ b/tests/end2end/test_dirbrowser.py
@@ -195,7 +195,6 @@ def test_enter_folder_smoke(dir_layout, quteproc):
 
 @pytest.mark.parametrize('folder', DirLayout.layout_folders())
 def test_enter_folder(dir_layout, quteproc, folder):
-    # pylint: disable=not-an-iterable
     quteproc.open_url(dir_layout.file_url())
     quteproc.click_element_by_text(text=folder)
     expected_url = urlutils.file_url(dir_layout.path(folder))
@@ -208,4 +207,3 @@ def test_enter_folder(dir_layout, quteproc, folder):
     assert foldernames == folders
     filenames = [item.text for item in page.files]
     assert filenames == files
-    # pylint: enable=not-an-iterable
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index b4e9742bc..63dc5b8b6 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -56,8 +56,7 @@ def test_state_config(fake_save_manager, data_tmpdir,
 
     if insert:
         state['general']['newval'] = '23'
-    # WORKAROUND for https://github.com/PyCQA/pylint/issues/574
-    if 'foobar' in (old_data or ''):  # pylint: disable=superfluous-parens
+    if 'foobar' in (old_data or ''):
         assert state['general']['foobar'] == '42'
 
     state._save()
@@ -105,10 +104,7 @@ class TestYaml:
 
         print(lines)
 
-        # WORKAROUND for https://github.com/PyCQA/pylint/issues/574
-        # pylint: disable=superfluous-parens
         if 'magenta' in (old_config or ''):
-            # pylint: enable=superfluous-parens
             assert '  colors.hints.fg: magenta' in lines
         if insert:
             assert '  tabs.show: never' in lines

From 7cebd95936903c99c29e3dae9e3f9e3d70305ed9 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 14:41:38 +0100
Subject: [PATCH 213/322] Simplify test_getitem

---
 tests/unit/misc/test_cmdhistory.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/unit/misc/test_cmdhistory.py b/tests/unit/misc/test_cmdhistory.py
index 44c6c2d82..0e6f9748e 100644
--- a/tests/unit/misc/test_cmdhistory.py
+++ b/tests/unit/misc/test_cmdhistory.py
@@ -84,8 +84,7 @@ def test_start_no_items(hist):
 
 def test_getitem(hist):
     """Test __getitem__."""
-    for i in range(0, len(HISTORY)):
-        assert hist[i] == HISTORY[i]
+    assert hist[0] == HISTORY[0]
 
 
 def test_setitem(hist):

From 79717528ec4c2489e69505baeea57d2088d07c55 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 14:42:37 +0100
Subject: [PATCH 214/322] Fix exception message formatting

---
 qutebrowser/browser/history.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index 81d1fb2f9..3b4b0e362 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -341,7 +341,7 @@ class WebHistory(sql.SqlTable):
                 f.write('\n'.join(lines))
             message.info("Dumped history to {}".format(dest))
         except OSError as e:
-            raise cmdexc.CommandError('Could not write history: {}', e)
+            raise cmdexc.CommandError('Could not write history: {}'.format(e))
 
 
 def init(parent=None):

From fc987ea9c0ca80bd8ca20d19b351ce2980e56ef7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 14:49:49 +0100
Subject: [PATCH 215/322] Make message.confirm_async keyword-only

---
 qutebrowser/browser/history.py | 4 ++--
 qutebrowser/utils/message.py   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index 3b4b0e362..ecab730ae 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -149,8 +149,8 @@ class WebHistory(sql.SqlTable):
         if force:
             self._do_clear()
         else:
-            message.confirm_async(self._do_clear, title="Clear all browsing "
-                                  "history?")
+            message.confirm_async(yes_action=self._do_clear,
+                                  title="Clear all browsing history?")
 
     def _do_clear(self):
         with self._handle_sql_errors():
diff --git a/qutebrowser/utils/message.py b/qutebrowser/utils/message.py
index 6957f115d..32395b8bd 100644
--- a/qutebrowser/utils/message.py
+++ b/qutebrowser/utils/message.py
@@ -137,8 +137,8 @@ def ask_async(title, mode, handler, **kwargs):
     global_bridge.ask(question, blocking=False)
 
 
-def confirm_async(yes_action, no_action=None, cancel_action=None,
-                  *args, **kwargs):
+def confirm_async(*, yes_action, no_action=None, cancel_action=None,
+                  **kwargs):
     """Ask a yes/no question to the user and execute the given actions.
 
     Args:
@@ -154,7 +154,7 @@ def confirm_async(yes_action, no_action=None, cancel_action=None,
         The question object.
     """
     kwargs['mode'] = usertypes.PromptMode.yesno
-    question = _build_question(*args, **kwargs)  # pylint: disable=missing-kwoa
+    question = _build_question(**kwargs)  # pylint: disable=missing-kwoa
     question.answered_yes.connect(yes_action)
     if no_action is not None:
         question.answered_no.connect(no_action)

From 1a4a9b43928783c5402a62d1384216e88be0c41e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 14:53:56 +0100
Subject: [PATCH 216/322] Declare *args before keyword arguments

See https://pylint.readthedocs.io/en/latest/whatsnew/1.8.html
---
 qutebrowser/browser/hints.py      | 5 +++--
 qutebrowser/commands/runners.py   | 2 +-
 qutebrowser/config/configtypes.py | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index 2520dd712..14cc2b574 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -619,8 +619,9 @@ class HintManager(QObject):
     @cmdutils.register(instance='hintmanager', scope='tab', name='hint',
                        star_args_optional=True, maxsplit=2)
     @cmdutils.argument('win_id', win_id=True)
-    def start(self, rapid=False, group=webelem.Group.all, target=Target.normal,
-              *args, win_id, mode=None, add_history=False):
+    def start(self,  # pylint: disable=keyword-arg-before-vararg
+              group=webelem.Group.all, target=Target.normal,
+              *args, win_id, mode=None, add_history=False, rapid=False):
         """Start hinting.
 
         Args:
diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py
index 095b49108..890a0275e 100644
--- a/qutebrowser/commands/runners.py
+++ b/qutebrowser/commands/runners.py
@@ -126,7 +126,7 @@ class CommandParser:
             new_cmd += ' '
         return new_cmd
 
-    def _parse_all_gen(self, text, aliases=True, *args, **kwargs):
+    def _parse_all_gen(self, text, *args, aliases=True, **kwargs):
         """Split a command on ;; and parse all parts.
 
         If the first command in the commandline is a non-split one, it only
diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py
index 320798f6b..71c32f59e 100644
--- a/qutebrowser/config/configtypes.py
+++ b/qutebrowser/config/configtypes.py
@@ -499,7 +499,7 @@ class ListOrValue(BaseType):
 
     _show_valtype = True
 
-    def __init__(self, valtype, none_ok=False, *args, **kwargs):
+    def __init__(self, valtype, *args, none_ok=False, **kwargs):
         super().__init__(none_ok)
         assert not isinstance(valtype, (List, ListOrValue)), valtype
         self.listtype = List(valtype, none_ok=none_ok, *args, **kwargs)

From 97a4e8d8471bd946e820aad928a371cbb793a544 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 16:03:34 +0100
Subject: [PATCH 217/322] Rewrite error handling in hist_importer script

Raise an exception instead of calling sys.exit
---
 scripts/hist_importer.py | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index f4ad47062..1b7bbde53 100755
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -29,6 +29,11 @@ import sys
 import os
 
 
+class Error(Exception):
+
+    pass
+
+
 def parse():
     """Parse command line arguments."""
     description = ("This program is meant to extract browser history from your"
@@ -63,10 +68,8 @@ def parse():
 def open_db(data_base):
     """Open connection with database."""
     if os.path.isfile(data_base):
-        conn = sqlite3.connect(data_base)
-        return conn
-    else:
-        sys.exit('The file {} does not exist.'.format(data_base))
+        return sqlite3.connect(data_base)
+    raise Error('The file {} does not exist.'.format(data_base))
 
 
 def extract(source, query):
@@ -87,8 +90,8 @@ def extract(source, query):
         conn.close()
         return history
     except sqlite3.OperationalError as op_e:
-        sys.exit('Could not perform queries on the source database: '
-                 '{}'.format(op_e))
+        raise Error('Could not perform queries on the source database: '
+                    '{}'.format(op_e))
 
 
 def clean(history):
@@ -130,7 +133,7 @@ def insert_qb(history, dest):
     conn.close()
 
 
-def main():
+def run():
     """Main control flux of the script."""
     args = parse()
     browser = args.browser.lower()
@@ -142,13 +145,20 @@ def main():
                   'from urls',
     }
     if browser not in query:
-        sys.exit('Sorry, the selected browser: "{}" is not supported.'.format(
-            browser))
+        raise Error('Sorry, the selected browser: "{}" is not '
+                    'supported.'.format(browser))
     else:
         history = extract(source, query[browser])
         history = clean(history)
         insert_qb(history, dest)
 
 
+def main():
+    try:
+        run()
+    except Error as e:
+        sys.exit(str(e))
+
+
 if __name__ == "__main__":
     main()

From 016fc0ebb1c324b47d50acca8b6e832d8c2a02ee Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 16:05:20 +0100
Subject: [PATCH 218/322] Fix some inconsistent returns

---
 qutebrowser/browser/downloads.py                 | 2 ++
 qutebrowser/browser/qtnetworkdownloads.py        | 5 ++---
 qutebrowser/browser/webkit/network/filescheme.py | 1 +
 qutebrowser/browser/webkit/rfc6266.py            | 1 +
 qutebrowser/commands/command.py                  | 1 +
 qutebrowser/config/config.py                     | 5 ++++-
 qutebrowser/config/configfiles.py                | 2 +-
 qutebrowser/keyinput/modeparsers.py              | 2 +-
 qutebrowser/mainwindow/prompt.py                 | 3 ++-
 qutebrowser/misc/sessions.py                     | 2 +-
 10 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index 354e74c9b..99869dae9 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -103,6 +103,8 @@ def immediate_download_path(prompt_download_directory=None):
     if not prompt_download_directory:
         return download_dir()
 
+    return None
+
 
 def _path_suggestion(filename):
     """Get the suggested file path.
diff --git a/qutebrowser/browser/qtnetworkdownloads.py b/qutebrowser/browser/qtnetworkdownloads.py
index 0e079b633..378bc72b5 100644
--- a/qutebrowser/browser/qtnetworkdownloads.py
+++ b/qutebrowser/browser/qtnetworkdownloads.py
@@ -303,8 +303,7 @@ class DownloadItem(downloads.AbstractDownloadItem):
         """Handle QNetworkReply errors."""
         if code == QNetworkReply.OperationCanceledError:
             return
-        else:
-            self._die(self._reply.errorString())
+        self._die(self._reply.errorString())
 
     @pyqtSlot()
     def _on_read_timer_timeout(self):
@@ -399,7 +398,7 @@ class DownloadManager(downloads.AbstractDownloadManager):
         """
         if not url.isValid():
             urlutils.invalid_url_error(url, "start download")
-            return
+            return None
         req = QNetworkRequest(url)
         if user_agent is not None:
             req.setHeader(QNetworkRequest.UserAgentHeader, user_agent)
diff --git a/qutebrowser/browser/webkit/network/filescheme.py b/qutebrowser/browser/webkit/network/filescheme.py
index a8cade1db..a971e3257 100644
--- a/qutebrowser/browser/webkit/network/filescheme.py
+++ b/qutebrowser/browser/webkit/network/filescheme.py
@@ -132,5 +132,6 @@ class FileSchemeHandler(schemehandler.SchemeHandler):
                 data = dirbrowser_html(path)
                 return networkreply.FixedDataNetworkReply(
                     request, data, 'text/html', self.parent())
+            return None
         except UnicodeEncodeError:
             return None
diff --git a/qutebrowser/browser/webkit/rfc6266.py b/qutebrowser/browser/webkit/rfc6266.py
index 1f71b23e5..f83413ee2 100644
--- a/qutebrowser/browser/webkit/rfc6266.py
+++ b/qutebrowser/browser/webkit/rfc6266.py
@@ -270,6 +270,7 @@ class _ContentDisposition:
         elif 'filename' in self.assocs:
             # XXX Reject non-ascii (parsed via qdtext) here?
             return self.assocs['filename']
+        return None
 
     def is_inline(self):
         """Return if the file should be handled inline.
diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py
index afb6253db..b4ff1cde8 100644
--- a/qutebrowser/commands/command.py
+++ b/qutebrowser/commands/command.py
@@ -190,6 +190,7 @@ class Command:
             return True
         elif arg_info.win_id:
             return True
+        return False
 
     def _inspect_func(self):
         """Inspect the function to get useful informations from it.
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 43fb7e839..c170d0705 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -107,12 +107,14 @@ class change_filter:  # noqa: N801,N806 pylint: disable=invalid-name
                 """Call the underlying function."""
                 if self._check_match(option):
                     return func()
+                return None
         else:
             @functools.wraps(func)
             def wrapper(wrapper_self, option=None):
                 """Call the underlying function."""
                 if self._check_match(option):
                     return func(wrapper_self)
+                return None
 
         return wrapper
 
@@ -463,7 +465,8 @@ class ConfigContainer:
     def __setattr__(self, attr, value):
         """Set the given option in the config."""
         if attr.startswith('_'):
-            return super().__setattr__(attr, value)
+            super().__setattr__(attr, value)
+            return
 
         name = self._join(attr)
         with self._handle_error('setting', name):
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 27c898611..0e9572f55 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -136,7 +136,7 @@ class YamlConfig(QObject):
             with open(self._filename, 'r', encoding='utf-8') as f:
                 yaml_data = utils.yaml_load(f)
         except FileNotFoundError:
-            return {}
+            return
         except OSError as e:
             desc = configexc.ConfigErrorDesc("While reading", e)
             raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
diff --git a/qutebrowser/keyinput/modeparsers.py b/qutebrowser/keyinput/modeparsers.py
index 1d74e5659..85b149470 100644
--- a/qutebrowser/keyinput/modeparsers.py
+++ b/qutebrowser/keyinput/modeparsers.py
@@ -218,7 +218,7 @@ class HintKeyParser(keyparser.CommandKeyParser):
             self._last_press = LastPress.none
             return True
         elif match == self.Match.other:
-            pass
+            return None
         elif match == self.Match.none:
             # We couldn't find a keychain so we check if it's a special key.
             return self._handle_special_key(e)
diff --git a/qutebrowser/mainwindow/prompt.py b/qutebrowser/mainwindow/prompt.py
index bd72d47ea..3d21a52e0 100644
--- a/qutebrowser/mainwindow/prompt.py
+++ b/qutebrowser/mainwindow/prompt.py
@@ -171,7 +171,7 @@ class PromptQueue(QObject):
             # just queue it up for later.
             log.prompt.debug("Adding {} to queue.".format(question))
             self._queue.append(question)
-            return
+            return None
 
         if blocking:
             # If we're blocking we save the old question on the stack, so we
@@ -207,6 +207,7 @@ class PromptQueue(QObject):
             return question.answer
         else:
             question.completed.connect(self._pop_later)
+            return None
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self, mode):
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index fcd82cda1..b46b5a26a 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -291,7 +291,7 @@ class SessionManager(QObject):
             data = self._last_window_session
             if data is None:
                 log.sessions.error("last_window_session is None while saving!")
-                return
+                return None
         else:
             data = self._save_all(only_window=only_window,
                                   with_private=with_private)

From f4ed31b2952d6c01969998e3dacd18762886100e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 16:12:31 +0100
Subject: [PATCH 219/322] Add an utils.Unreachable exception

---
 .coveragerc                                 |  1 +
 qutebrowser/browser/browsertab.py           |  4 ++--
 qutebrowser/browser/shared.py               |  4 ++--
 qutebrowser/completion/completer.py         |  3 +--
 qutebrowser/completion/completionwidget.py  |  5 +++++
 qutebrowser/config/configdata.py            |  1 +
 qutebrowser/keyinput/basekeyparser.py       |  2 +-
 qutebrowser/mainwindow/statusbar/command.py |  6 +++---
 qutebrowser/misc/backendproblem.py          | 11 ++++-------
 qutebrowser/misc/miscwidgets.py             |  4 ++--
 qutebrowser/misc/split.py                   |  5 +++--
 qutebrowser/utils/utils.py                  |  5 +++++
 tests/end2end/fixtures/testprocess.py       |  2 ++
 tests/unit/browser/test_tab.py              |  5 +++--
 tests/unit/commands/test_userscripts.py     |  1 +
 tests/unit/utils/test_version.py            |  2 +-
 16 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 18fb85ba4..9ba8e8a5e 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -12,6 +12,7 @@ exclude_lines =
     def __repr__
     raise AssertionError
     raise NotImplementedError
+    raise utils\.Unreachable
     if __name__ == ["']__main__["']:
 
 [xml]
diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 57a3f6ba7..eb0e55c4b 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -706,8 +706,8 @@ class AbstractTab(QWidget):
         # This only gives us some mild protection against re-using events, but
         # it's certainly better than a segfault.
         if getattr(evt, 'posted', False):
-            raise AssertionError("Can't re-use an event which was already "
-                                 "posted!")
+            raise utils.Unreachable("Can't re-use an event which was already "
+                                    "posted!")
         recipient = self.event_target()
         evt.posted = True
         QApplication.postEvent(recipient, evt)
diff --git a/qutebrowser/browser/shared.py b/qutebrowser/browser/shared.py
index ab1b6ad9f..b6bfefe7b 100644
--- a/qutebrowser/browser/shared.py
+++ b/qutebrowser/browser/shared.py
@@ -22,7 +22,7 @@
 import html
 
 from qutebrowser.config import config
-from qutebrowser.utils import usertypes, message, log, objreg, jinja
+from qutebrowser.utils import usertypes, message, log, objreg, jinja, utils
 from qutebrowser.mainwindow import mainwindow
 
 
@@ -182,7 +182,7 @@ def ignore_certificate_errors(url, errors, abort_on):
         return False
     else:
         raise ValueError("Invalid ssl_strict value {!r}".format(ssl_strict))
-    raise AssertionError("Not reached")
+    raise utils.Unreachable
 
 
 def feature_permission(url, option, msg, yes_action, no_action, abort_on):
diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py
index 6eb8b51c4..2e5b75f2d 100644
--- a/qutebrowser/completion/completer.py
+++ b/qutebrowser/completion/completer.py
@@ -153,8 +153,7 @@ class Completer(QObject):
                     "partitioned: {} '{}' {}".format(prefix, center, postfix))
                 return prefix, center, postfix
 
-        # We should always return above
-        assert False, parts
+        raise utils.Unreachable("Not all parts consumed: {}".format(parts))
 
     @pyqtSlot(str)
     def on_selection_changed(self, text):
diff --git a/qutebrowser/completion/completionwidget.py b/qutebrowser/completion/completionwidget.py
index f1be785e1..29f4f6653 100644
--- a/qutebrowser/completion/completionwidget.py
+++ b/qutebrowser/completion/completionwidget.py
@@ -180,6 +180,7 @@ class CompletionView(QTreeView):
                 return self.model().last_item()
             else:
                 return self.model().first_item()
+
         while True:
             idx = self.indexAbove(idx) if upwards else self.indexBelow(idx)
             # wrap around if we arrived at beginning/end
@@ -193,6 +194,8 @@ class CompletionView(QTreeView):
                 # Item is a real item, not a category header -> success
                 return idx
 
+        raise utils.Unreachable
+
     def _next_category_idx(self, upwards):
         """Get the index of the previous/next category.
 
@@ -222,6 +225,8 @@ class CompletionView(QTreeView):
                 self.scrollTo(idx)
                 return idx.child(0, 0)
 
+        raise utils.Unreachable
+
     @cmdutils.register(instance='completion',
                        modes=[usertypes.KeyMode.command], scope='window')
     @cmdutils.argument('which', choices=['next', 'prev', 'next-category',
diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index 143cbd49a..b265ab8fc 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -174,6 +174,7 @@ def _parse_yaml_backends(name, node):
     elif isinstance(node, dict):
         return _parse_yaml_backends_dict(name, node)
     _raise_invalid_node(name, 'backends', node)
+    raise utils.Unreachable
 
 
 def _read_yaml(yaml_data):
diff --git a/qutebrowser/keyinput/basekeyparser.py b/qutebrowser/keyinput/basekeyparser.py
index 658b52d2d..b435ac52c 100644
--- a/qutebrowser/keyinput/basekeyparser.py
+++ b/qutebrowser/keyinput/basekeyparser.py
@@ -214,7 +214,7 @@ class BaseKeyParser(QObject):
         elif match == self.Match.other:
             pass
         else:
-            raise AssertionError("Invalid match value {!r}".format(match))
+            raise utils.Unreachable("Invalid match value {!r}".format(match))
         return match
 
     def _match_key(self, cmd_input):
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 3e0a339a3..ab8ac7b5d 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -26,7 +26,7 @@ from qutebrowser.keyinput import modeman, modeparsers
 from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.misc import cmdhistory, editor
 from qutebrowser.misc import miscwidgets as misc
-from qutebrowser.utils import usertypes, log, objreg, message
+from qutebrowser.utils import usertypes, log, objreg, message, utils
 from qutebrowser.config import config
 
 
@@ -221,8 +221,8 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         elif text[0] in modeparsers.STARTCHARS:
             super().set_prompt(text[0])
         else:
-            raise AssertionError("setText got called with invalid text "
-                                 "'{}'!".format(text))
+            raise utils.Unreachable("setText got called with invalid text "
+                                    "'{}'!".format(text))
         super().setText(text)
 
     def keyPressEvent(self, e):
diff --git a/qutebrowser/misc/backendproblem.py b/qutebrowser/misc/backendproblem.py
index 8a51d50ce..8cc5b71b2 100644
--- a/qutebrowser/misc/backendproblem.py
+++ b/qutebrowser/misc/backendproblem.py
@@ -152,7 +152,7 @@ def _show_dialog(*args, **kwargs):
     elif status == _Result.restart:
         quitter.restart()
     else:
-        assert False, status
+        raise utils.Unreachable(status)
 
     sys.exit(usertypes.Exit.err_init)
 
@@ -199,8 +199,7 @@ def _handle_nouveau_graphics():
         buttons=[button],
     )
 
-    # Should never be reached
-    assert False
+    raise utils.Unreachable
 
 
 def _handle_wayland():
@@ -239,8 +238,7 @@ def _handle_wayland():
                  "(based on Chromium). "
         )
 
-    # Should never be reached
-    assert False
+    raise utils.Unreachable
 
 
 @attr.s
@@ -359,8 +357,7 @@ def _check_backend_modules():
                 html.escape(imports.webengine_error))
         )
 
-    # Should never be reached
-    assert False
+    raise utils.Unreachable
 
 
 def init():
diff --git a/qutebrowser/misc/miscwidgets.py b/qutebrowser/misc/miscwidgets.py
index f398feb4c..5d3e9b5ca 100644
--- a/qutebrowser/misc/miscwidgets.py
+++ b/qutebrowser/misc/miscwidgets.py
@@ -241,7 +241,7 @@ class WrapperLayout(QLayout):
         self._widget = None
 
     def addItem(self, _widget):
-        raise AssertionError("Should never be called!")
+        raise utils.Unreachable
 
     def sizeHint(self):
         return self._widget.sizeHint()
@@ -250,7 +250,7 @@ class WrapperLayout(QLayout):
         return None
 
     def takeAt(self, _index):
-        raise AssertionError("Should never be called!")
+        raise utils.Unreachable
 
     def setGeometry(self, rect):
         self._widget.setGeometry(rect)
diff --git a/qutebrowser/misc/split.py b/qutebrowser/misc/split.py
index bdde2b7ee..2ae8b3792 100644
--- a/qutebrowser/misc/split.py
+++ b/qutebrowser/misc/split.py
@@ -21,7 +21,7 @@
 
 import re
 
-from qutebrowser.utils import log
+from qutebrowser.utils import log, utils
 
 
 class ShellLexer:
@@ -117,7 +117,8 @@ class ShellLexer:
                 else:
                     self.token += nextchar
             else:
-                raise AssertionError("Invalid state {!r}!".format(self.state))
+                raise utils.Unreachable(
+                    "Invalid state {!r}!".format(self.state))
         if self.state in self.escape and not self.keep:
             self.token += self.state
         if self.token or self.quoted:
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index 8333c4132..b277ccb77 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -60,6 +60,11 @@ is_windows = sys.platform.startswith('win')
 is_posix = os.name == 'posix'
 
 
+class Unreachable(Exception):
+
+    """Raised when there was unreachable code."""
+
+
 class ClipboardError(Exception):
 
     """Raised if the clipboard contents are unavailable for some reason."""
diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index 7836ab79a..ac220af58 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -404,6 +404,8 @@ class Process(QObject):
                     self._log("----> found it")
                 return match
 
+        raise quteutils.Unreachable
+
     def _wait_for_match(self, spy, kwargs):
         """Try matching the kwargs with the given QSignalSpy."""
         for args in spy:
diff --git a/tests/unit/browser/test_tab.py b/tests/unit/browser/test_tab.py
index a2a34d9ce..d67ee4c8f 100644
--- a/tests/unit/browser/test_tab.py
+++ b/tests/unit/browser/test_tab.py
@@ -20,6 +20,7 @@
 import pytest
 
 from qutebrowser.browser import browsertab
+from qutebrowser.utils import utils
 
 pytestmark = pytest.mark.usefixtures('redirect_webengine_data')
 
@@ -54,7 +55,7 @@ def tab(request, qtbot, tab_registry, cookiejar_and_cache, mode_manager):
             'qutebrowser.browser.webengine.webenginetab')
         tab_class = webenginetab.WebEngineTab
     else:
-        assert False
+        raise utils.Unreachable
 
     t = tab_class(win_id=0, mode_manager=mode_manager)
     qtbot.add_widget(t)
@@ -67,7 +68,7 @@ class Zoom(browsertab.AbstractZoom):
         pass
 
     def factor(self):
-        assert False
+        raise utils.Unreachable
 
 
 class Tab(browsertab.AbstractTab):
diff --git a/tests/unit/commands/test_userscripts.py b/tests/unit/commands/test_userscripts.py
index 32f9a1bb9..3b6a69710 100644
--- a/tests/unit/commands/test_userscripts.py
+++ b/tests/unit/commands/test_userscripts.py
@@ -64,6 +64,7 @@ def runner(request, runtime_tmpdir):
     if (not utils.is_posix and
             request.param is userscripts._POSIXUserscriptRunner):
         pytest.skip("Requires a POSIX os")
+        raise utils.Unreachable
     else:
         return request.param()
 
diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index 3d01fcfb5..620e0688a 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -795,7 +795,7 @@ class FakeQSslSocket:
     def sslLibraryVersionString(self):
         """Fake for QSslSocket::sslLibraryVersionString()."""
         if self._version is None:
-            raise AssertionError("Got called with version None!")
+            raise utils.Unreachable("Got called with version None!")
         return self._version
 
 

From 26a622c46d71996c42a2f1b6f5b380e2a6a9c620 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 16:25:22 +0100
Subject: [PATCH 220/322] Disable wrong inconsistent-return-statements

---
 qutebrowser/mainwindow/mainwindow.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 7c35f0529..3adce7567 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -103,7 +103,8 @@ def raise_window(window):
     QApplication.instance().alert(window)
 
 
-def get_target_window():
+# WORKAROUND for https://github.com/PyCQA/pylint/issues/1770
+def get_target_window():  # pylint: disable=inconsistent-return-statements
     """Get the target window for new tabs, or None if none exist."""
     try:
         win_mode = config.val.new_instance_open_target_window

From 4c24b9ed4a238200c0c513bd4d3ec7a6ce4a1928 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 17:16:55 +0100
Subject: [PATCH 221/322] Reorder pylint disables

---
 .pylintrc | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index a6bebec71..8ab3b83a7 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -13,35 +13,35 @@ persistent=n
 
 [MESSAGES CONTROL]
 enable=all
-disable=no-self-use,
-        fixme,
-        global-statement,
-        locally-disabled,
-        locally-enabled,
-        too-many-ancestors,
-        too-few-public-methods,
-        too-many-public-methods,
+disable=fixme,
+        no-self-use,
         cyclic-import,
         bad-continuation,
-        too-many-instance-attributes,
         blacklisted-name,
-        too-many-lines,
         logging-format-interpolation,
         broad-except,
         bare-except,
         eval-used,
         exec-used,
+        global-statement,
         ungrouped-imports,
         suppressed-message,
-        too-many-return-statements,
         duplicate-code,
         wrong-import-position,
         no-else-return,
         logging-not-lazy,
+        locally-disabled,
+        locally-enabled,
+        too-many-ancestors,
+        too-many-public-methods,
+        too-many-instance-attributes,
+        too-many-lines,
+        too-many-return-statements,
         too-many-boolean-expressions,
         too-many-locals,
         too-many-branches,
-        too-many-statements
+        too-many-statements,
+        too-few-public-methods
 
 [BASIC]
 function-rgx=[a-z_][a-z0-9_]{2,50}$

From 93cd200bb71f53d4dbbba14a239bf01776bf850e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 19:06:23 +0100
Subject: [PATCH 222/322] Add docstring

---
 scripts/hist_importer.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index 1b7bbde53..84fada560 100755
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -31,6 +31,8 @@ import os
 
 class Error(Exception):
 
+    """Exception for errors in this module."""
+
     pass
 
 

From e65c0dd8a7ed5c1955361ff8336036422b954d3f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 19:08:15 +0100
Subject: [PATCH 223/322] pylint: Re-enable bad-continuation

And lots and lots of whitespace changes.
---
 .pylintrc                                     |   1 -
 qutebrowser/app.py                            |   4 +-
 qutebrowser/browser/commands.py               |   4 +-
 qutebrowser/browser/downloads.py              |   2 +-
 qutebrowser/browser/pdfjs.py                  |   2 +-
 qutebrowser/browser/qutescheme.py             |   4 +-
 qutebrowser/completion/completer.py           |   6 +-
 qutebrowser/completion/models/configmodel.py  |   3 +-
 qutebrowser/completion/models/miscmodels.py   |   2 +-
 qutebrowser/keyinput/modeparsers.py           |   2 +-
 qutebrowser/misc/earlyinit.py                 |  12 +-
 qutebrowser/misc/editor.py                    |   2 +
 qutebrowser/qutebrowser.py                    |   3 +-
 qutebrowser/utils/log.py                      |  44 +++----
 qutebrowser/utils/objreg.py                   |   2 +-
 qutebrowser/utils/urlutils.py                 |   4 +-
 scripts/asciidoc2html.py                      |   9 +-
 scripts/dev/check_coverage.py                 | 118 +++++++++---------
 scripts/dev/recompile_requirements.py         |   8 +-
 scripts/dev/src2asciidoc.py                   |   2 +-
 scripts/dictcli.py                            |  11 +-
 scripts/importer.py                           |  46 +++----
 tests/conftest.py                             |   4 +-
 tests/end2end/features/test_javascript_bdd.py |   2 +-
 tests/end2end/fixtures/quteprocess.py         |  11 +-
 tests/end2end/fixtures/test_quteprocess.py    |   4 +-
 tests/end2end/test_hints_html.py              |   4 +-
 tests/unit/browser/test_history.py            |   8 +-
 tests/unit/browser/test_qutescheme.py         |   2 +-
 tests/unit/completion/test_completer.py       |   2 +-
 tests/unit/completion/test_completionmodel.py |   3 +-
 .../unit/completion/test_completionwidget.py  |  13 +-
 tests/unit/completion/test_models.py          |   8 +-
 tests/unit/config/test_configfiles.py         |   7 +-
 tests/unit/config/test_configinit.py          |   4 +-
 tests/unit/config/test_configtypes.py         |  20 +--
 tests/unit/misc/test_ipc.py                   |  12 +-
 tests/unit/misc/test_miscwidgets.py           |   2 +-
 tests/unit/misc/test_sql.py                   |   8 +-
 tests/unit/scripts/test_importer.py           |  18 +--
 tests/unit/utils/test_qtutils.py              |   3 +
 tests/unit/utils/test_urlutils.py             |  34 +++--
 tests/unit/utils/test_utils.py                |   2 +-
 tests/unit/utils/test_version.py              |   8 +-
 44 files changed, 235 insertions(+), 235 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index 8ab3b83a7..00e206fb5 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -16,7 +16,6 @@ enable=all
 disable=fixme,
         no-self-use,
         cyclic-import,
-        bad-continuation,
         blacklisted-name,
         logging-format-interpolation,
         broad-except,
diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 7029f8df5..a2d768923 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -564,8 +564,8 @@ class Quitter:
             cwd = os.path.abspath(os.path.dirname(sys.executable))
         else:
             args = [sys.executable, '-m', 'qutebrowser']
-            cwd = os.path.join(os.path.abspath(os.path.dirname(
-                               qutebrowser.__file__)), '..')
+            cwd = os.path.join(
+                os.path.abspath(os.path.dirname(qutebrowser.__file__)), '..')
             if not os.path.isdir(cwd):
                 # Probably running from a python egg. Let's fallback to
                 # cwd=None and see if that works out.
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index c65df71bc..92a841d72 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -673,7 +673,7 @@ class CommandDispatcher:
                 self._open(new_url, tab, bg, window, related=True)
             else:  # pragma: no cover
                 raise ValueError("Got called with invalid value {} for "
-                                "`where'.".format(where))
+                                 "`where'.".format(where))
         except navigate.Error as e:
             raise cmdexc.CommandError(e)
 
@@ -1738,7 +1738,7 @@ class CommandDispatcher:
                 message.info("Search hit TOP, continuing at BOTTOM")
         else:
             message.warning("Text '{}' not found on page!".format(text),
-                replace=True)
+                            replace=True)
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        maxsplit=0)
diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index 99869dae9..c064d700e 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -992,7 +992,7 @@ class DownloadModel(QAbstractListModel):
                 if not count:
                     count = len(self)
                 raise cmdexc.CommandError("Download {} is already done!"
-                                        .format(count))
+                                          .format(count))
             download.cancel()
 
     @cmdutils.register(instance='download-model', scope='window')
diff --git a/qutebrowser/browser/pdfjs.py b/qutebrowser/browser/pdfjs.py
index d003cefb1..cd5bcac0a 100644
--- a/qutebrowser/browser/pdfjs.py
+++ b/qutebrowser/browser/pdfjs.py
@@ -82,7 +82,7 @@ def fix_urls(asset):
         ('viewer.css', 'qute://pdfjs/web/viewer.css'),
         ('compatibility.js', 'qute://pdfjs/web/compatibility.js'),
         ('locale/locale.properties',
-            'qute://pdfjs/web/locale/locale.properties'),
+         'qute://pdfjs/web/locale/locale.properties'),
         ('l10n.js', 'qute://pdfjs/web/l10n.js'),
         ('../build/pdf.js', 'qute://pdfjs/build/pdf.js'),
         ('debugger.js', 'qute://pdfjs/web/debugger.js'),
diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 9cfef039a..8bcb7ff37 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -139,7 +139,7 @@ def data_for_url(url):
         A (mimetype, data) tuple.
     """
     norm_url = url.adjusted(QUrl.NormalizePathSegments |
-            QUrl.StripTrailingSlash)
+                            QUrl.StripTrailingSlash)
     if norm_url != url:
         raise Redirect(norm_url)
 
@@ -455,7 +455,7 @@ def qute_configdiff(url):
             return 'text/html', configdiff.get_diff()
         except OSError as e:
             error = (b'Failed to read old config: ' +
-                    str(e.strerror).encode('utf-8'))
+                     str(e.strerror).encode('utf-8'))
             return 'text/plain', error
     else:
         data = config.instance.dump_userconfig().encode('utf-8')
diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py
index 2e5b75f2d..30a180554 100644
--- a/qutebrowser/completion/completer.py
+++ b/qutebrowser/completion/completer.py
@@ -206,7 +206,7 @@ class Completer(QObject):
             log.completion.debug("Ignoring update because the length of "
                                  "the text is less than completion.min_chars.")
         elif (self._cmd.cursorPosition() == self._last_cursor_pos and
-                self._cmd.text() == self._last_text):
+              self._cmd.text() == self._last_text):
             log.completion.debug("Ignoring update because there were no "
                                  "changes.")
         else:
@@ -247,8 +247,8 @@ class Completer(QObject):
         if func != self._last_completion_func:
             self._last_completion_func = func
             args = (x for x in before_cursor[1:] if not x.startswith('-'))
-            with debug.log_time(log.completion,
-                    'Starting {} completion'.format(func.__name__)):
+            with debug.log_time(log.completion, 'Starting {} completion'
+                                .format(func.__name__)):
                 info = CompletionInfo(config=config.instance,
                                       keyconf=config.key_instance,
                                       win_id=self._win_id)
diff --git a/qutebrowser/completion/models/configmodel.py b/qutebrowser/completion/models/configmodel.py
index 53a2adc19..445a57a66 100644
--- a/qutebrowser/completion/models/configmodel.py
+++ b/qutebrowser/completion/models/configmodel.py
@@ -60,7 +60,8 @@ def value(optname, *_values, info):
 
     opt = info.config.get_opt(optname)
     default = opt.typ.to_str(opt.default)
-    cur_cat = listcategory.ListCategory("Current/Default",
+    cur_cat = listcategory.ListCategory(
+        "Current/Default",
         [(current, "Current value"), (default, "Default value")])
     model.add_category(cur_cat)
 
diff --git a/qutebrowser/completion/models/miscmodels.py b/qutebrowser/completion/models/miscmodels.py
index b1e599798..22c9000c3 100644
--- a/qutebrowser/completion/models/miscmodels.py
+++ b/qutebrowser/completion/models/miscmodels.py
@@ -123,7 +123,7 @@ def _buffer(skip_win_id=None):
                          tab.url().toDisplayString(),
                          tabbed_browser.page_title(idx)))
         cat = listcategory.ListCategory("{}".format(win_id), tabs,
-            delete_func=delete_buffer)
+                                        delete_func=delete_buffer)
         model.add_category(cat)
 
     return model
diff --git a/qutebrowser/keyinput/modeparsers.py b/qutebrowser/keyinput/modeparsers.py
index 85b149470..7c2088133 100644
--- a/qutebrowser/keyinput/modeparsers.py
+++ b/qutebrowser/keyinput/modeparsers.py
@@ -71,7 +71,7 @@ class NormalKeyParser(keyparser.CommandKeyParser):
         txt = e.text().strip()
         if self._inhibited:
             self._debug_log("Ignoring key '{}', because the normal mode is "
-                "currently inhibited.".format(txt))
+                            "currently inhibited.".format(txt))
             return self.Match.none
         match = super()._handle_single_key(e)
         if match == self.Match.partial:
diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py
index 9b4a6e8a5..10530eecf 100644
--- a/qutebrowser/misc/earlyinit.py
+++ b/qutebrowser/misc/earlyinit.py
@@ -202,14 +202,14 @@ def _check_modules(modules):
             messages = ['invalid escape sequence',
                         'Flags not at the start of the expression']
             with log.ignore_py_warnings(
-                    category=DeprecationWarning,
-                    message=r'({})'.format('|'.join(messages))
+                category=DeprecationWarning,
+                message=r'({})'.format('|'.join(messages))
             ), log.ignore_py_warnings(
-                    category=PendingDeprecationWarning,
-                    module='imp'
+                category=PendingDeprecationWarning,
+                module='imp'
             ), log.ignore_py_warnings(
-                    category=ImportWarning,
-                    message=r'Not importing directory .*: missing __init__'
+                category=ImportWarning,
+                message=r'Not importing directory .*: missing __init__'
             ):
                 importlib.import_module(name)
         except ImportError as e:
diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 7c183f7f9..553c700e7 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -111,9 +111,11 @@ class ExternalEditor(QObject):
             # the file from the external editor, see
             # https://github.com/qutebrowser/qutebrowser/issues/1767
             with tempfile.NamedTemporaryFile(
+                    # pylint: disable=bad-continuation
                     mode='w', prefix='qutebrowser-editor-',
                     encoding=config.val.editor.encoding,
                     delete=False) as fobj:
+                    # pylint: enable=bad-continuation
                 if text:
                     fobj.write(text)
                 self._filename = fobj.name
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py
index ad53f45ca..fc113a5d4 100644
--- a/qutebrowser/qutebrowser.py
+++ b/qutebrowser/qutebrowser.py
@@ -74,7 +74,8 @@ def get_argparser():
                         "session even if one would be restored.",
                         action='store_true')
     parser.add_argument('--target', choices=['auto', 'tab', 'tab-bg',
-                        'tab-silent', 'tab-bg-silent', 'window'],
+                                             'tab-silent', 'tab-bg-silent',
+                                             'window'],
                         help="How URLs should be opened if there is already a "
                              "qutebrowser instance running.")
     parser.add_argument('--backend', choices=['webkit', 'webengine'],
diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py
index dc0ff5580..1a65b6eb8 100644
--- a/qutebrowser/utils/log.py
+++ b/qutebrowser/utils/log.py
@@ -361,29 +361,29 @@ def qt_message_handler(msg_type, context, msg):
     suppressed_msgs = [
         # PNGs in Qt with broken color profile
         # https://bugreports.qt.io/browse/QTBUG-39788
-        'libpng warning: iCCP: Not recognizing known sRGB profile that has '
-            'been edited',  # noqa: E131
+        ('libpng warning: iCCP: Not recognizing known sRGB profile that has '
+         'been edited'),
         'libpng warning: iCCP: known incorrect sRGB profile',
         # Hopefully harmless warning
         'OpenType support missing for script ',
         # Error if a QNetworkReply gets two different errors set. Harmless Qt
         # bug on some pages.
         # https://bugreports.qt.io/browse/QTBUG-30298
-        'QNetworkReplyImplPrivate::error: Internal problem, this method must '
-            'only be called once.',
+        ('QNetworkReplyImplPrivate::error: Internal problem, this method must '
+         'only be called once.'),
         # Sometimes indicates missing text, but most of the time harmless
         'load glyph failed ',
         # Harmless, see https://bugreports.qt.io/browse/QTBUG-42479
-        'content-type missing in HTTP POST, defaulting to '
-            'application/x-www-form-urlencoded. '
-            'Use QNetworkRequest::setHeader() to fix this problem.',
+        ('content-type missing in HTTP POST, defaulting to '
+         'application/x-www-form-urlencoded. '
+         'Use QNetworkRequest::setHeader() to fix this problem.'),
         # https://bugreports.qt.io/browse/QTBUG-43118
         'Using blocking call!',
         # Hopefully harmless
-        '"Method "GetAll" with signature "s" on interface '
-            '"org.freedesktop.DBus.Properties" doesn\'t exist',
-        '"Method \\"GetAll\\" with signature \\"s\\" on interface '
-            '\\"org.freedesktop.DBus.Properties\\" doesn\'t exist\\n"',
+        ('"Method "GetAll" with signature "s" on interface '
+         '"org.freedesktop.DBus.Properties" doesn\'t exist'),
+        ('"Method \\"GetAll\\" with signature \\"s\\" on interface '
+         '\\"org.freedesktop.DBus.Properties\\" doesn\'t exist\\n"'),
         'WOFF support requires QtWebKit to be built with zlib support.',
         # Weird Enlightment/GTK X extensions
         'QXcbWindow: Unhandled client message: "_E_',
@@ -392,21 +392,21 @@ def qt_message_handler(msg_type, context, msg):
         # Happens on AppVeyor CI
         'SetProcessDpiAwareness failed:',
         # https://bugreports.qt.io/browse/QTBUG-49174
-        'QObject::connect: Cannot connect (null)::stateChanged('
-            'QNetworkSession::State) to '
-            'QNetworkReplyHttpImpl::_q_networkSessionStateChanged('
-            'QNetworkSession::State)',
+        ('QObject::connect: Cannot connect (null)::stateChanged('
+         'QNetworkSession::State) to '
+         'QNetworkReplyHttpImpl::_q_networkSessionStateChanged('
+         'QNetworkSession::State)'),
         # https://bugreports.qt.io/browse/QTBUG-53989
-        "Image of format '' blocked because it is not considered safe. If you "
-            "are sure it is safe to do so, you can white-list the format by "
-            "setting the environment variable QTWEBKIT_IMAGEFORMAT_WHITELIST=",
+        ("Image of format '' blocked because it is not considered safe. If "
+         "you are sure it is safe to do so, you can white-list the format by "
+         "setting the environment variable QTWEBKIT_IMAGEFORMAT_WHITELIST="),
         # Installing Qt from the installer may cause it looking for SSL3 or
         # OpenSSL 1.0 which may not be available on the system
         "QSslSocket: cannot resolve ",
         "QSslSocket: cannot call unresolved function ",
         # When enabling debugging with QtWebEngine
-        "Remote debugging server started successfully. Try pointing a "
-            "Chromium-based browser to ",
+        ("Remote debugging server started successfully. Try pointing a "
+         "Chromium-based browser to "),
         # https://github.com/qutebrowser/qutebrowser/issues/1287
         "QXcbClipboard: SelectionRequest too old",
         # https://github.com/qutebrowser/qutebrowser/issues/2071
@@ -420,8 +420,8 @@ def qt_message_handler(msg_type, context, msg):
         suppressed_msgs += [
             'libpng warning: iCCP: known incorrect sRGB profile',
             # https://bugreports.qt.io/browse/QTBUG-47154
-            'virtual void QSslSocketBackendPrivate::transmit() SSLRead failed '
-                'with: -9805',  # noqa: E131
+            ('virtual void QSslSocketBackendPrivate::transmit() SSLRead '
+             'failed with: -9805'),
         ]
 
     if not msg:
diff --git a/qutebrowser/utils/objreg.py b/qutebrowser/utils/objreg.py
index df962a165..f65e4efab 100644
--- a/qutebrowser/utils/objreg.py
+++ b/qutebrowser/utils/objreg.py
@@ -254,7 +254,7 @@ def register(name, obj, update=False, scope=None, registry=None, window=None,
         reg = _get_registry(scope, window, tab)
     if not update and name in reg:
         raise KeyError("Object '{}' is already registered ({})!".format(
-                       name, repr(reg[name])))
+            name, repr(reg[name])))
     reg[name] = obj
 
 
diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py
index 50b1632d0..97e03c072 100644
--- a/qutebrowser/utils/urlutils.py
+++ b/qutebrowser/utils/urlutils.py
@@ -192,7 +192,7 @@ def fuzzy_url(urlstr, cwd=None, relative=False, do_search=True,
         log.url.debug("URL is a fuzzy address")
         url = qurl_from_user_input(urlstr)
     log.url.debug("Converting fuzzy term {!r} to URL -> {}".format(
-                  urlstr, url.toDisplayString()))
+        urlstr, url.toDisplayString()))
     if do_search and config.val.url.auto_search != 'never' and urlstr:
         qtutils.ensure_valid(url)
     else:
@@ -241,7 +241,7 @@ def is_url(urlstr):
     autosearch = config.val.url.auto_search
 
     log.url.debug("Checking if {!r} is a URL (autosearch={}).".format(
-                  urlstr, autosearch))
+        urlstr, autosearch))
 
     urlstr = urlstr.strip()
     qurl = QUrl(urlstr)
diff --git a/scripts/asciidoc2html.py b/scripts/asciidoc2html.py
index dbd4b7679..dce1f27bd 100755
--- a/scripts/asciidoc2html.py
+++ b/scripts/asciidoc2html.py
@@ -86,9 +86,9 @@ class AsciiDoc:
         # patch image links to use local copy
         replacements = [
             ("https://qutebrowser.org/img/cheatsheet-big.png",
-                "qute://help/img/cheatsheet-big.png"),
+             "qute://help/img/cheatsheet-big.png"),
             ("https://qutebrowser.org/img/cheatsheet-small.png",
-                "qute://help/img/cheatsheet-small.png")
+             "qute://help/img/cheatsheet-small.png")
         ]
         asciidoc_args = ['-a', 'source-highlighter=pygments']
 
@@ -211,9 +211,8 @@ class AsciiDoc:
             shutil.copytree(src, full_dest)
 
         for dst, link_name in [
-            ('README.html', 'index.html'),
-            (os.path.join('doc', 'quickstart.html'), 'quickstart.html'),
-        ]:
+                ('README.html', 'index.html'),
+                (os.path.join('doc', 'quickstart.html'), 'quickstart.html')]:
             try:
                 os.symlink(dst, os.path.join(outdir, link_name))
             except FileExistsError:
diff --git a/scripts/dev/check_coverage.py b/scripts/dev/check_coverage.py
index f2c9dd853..49055dad2 100644
--- a/scripts/dev/check_coverage.py
+++ b/scripts/dev/check_coverage.py
@@ -52,132 +52,132 @@ MsgType = enum.Enum('MsgType', 'insufficent_coverage, perfect_file')
 # A list of (test_file, tested_file) tuples. test_file can be None.
 PERFECT_FILES = [
     (None,
-        'commands/cmdexc.py'),
+     'commands/cmdexc.py'),
     ('tests/unit/commands/test_cmdutils.py',
-        'commands/cmdutils.py'),
+     'commands/cmdutils.py'),
     ('tests/unit/commands/test_argparser.py',
-        'commands/argparser.py'),
+     'commands/argparser.py'),
 
     ('tests/unit/browser/webkit/test_cache.py',
-        'browser/webkit/cache.py'),
+     'browser/webkit/cache.py'),
     ('tests/unit/browser/webkit/test_cookies.py',
-        'browser/webkit/cookies.py'),
+     'browser/webkit/cookies.py'),
     ('tests/unit/browser/test_history.py',
-        'browser/history.py'),
+     'browser/history.py'),
     ('tests/unit/browser/webkit/http/test_http.py',
-        'browser/webkit/http.py'),
+     'browser/webkit/http.py'),
     ('tests/unit/browser/webkit/http/test_content_disposition.py',
-        'browser/webkit/rfc6266.py'),
+     'browser/webkit/rfc6266.py'),
     # ('tests/unit/browser/webkit/test_webkitelem.py',
-    #     'browser/webkit/webkitelem.py'),
+    #  'browser/webkit/webkitelem.py'),
     # ('tests/unit/browser/webkit/test_webkitelem.py',
-    #     'browser/webelem.py'),
+    #  'browser/webelem.py'),
     ('tests/unit/browser/webkit/network/test_schemehandler.py',
-        'browser/webkit/network/schemehandler.py'),
+     'browser/webkit/network/schemehandler.py'),
     ('tests/unit/browser/webkit/network/test_filescheme.py',
-        'browser/webkit/network/filescheme.py'),
+     'browser/webkit/network/filescheme.py'),
     ('tests/unit/browser/webkit/network/test_networkreply.py',
-        'browser/webkit/network/networkreply.py'),
+     'browser/webkit/network/networkreply.py'),
 
     ('tests/unit/browser/test_signalfilter.py',
-        'browser/signalfilter.py'),
+     'browser/signalfilter.py'),
     (None,
-        'browser/webengine/certificateerror.py'),
+     'browser/webengine/certificateerror.py'),
     # ('tests/unit/browser/test_tab.py',
-    #     'browser/tab.py'),
+    #  'browser/tab.py'),
 
     ('tests/unit/keyinput/test_basekeyparser.py',
-        'keyinput/basekeyparser.py'),
+     'keyinput/basekeyparser.py'),
 
     ('tests/unit/misc/test_autoupdate.py',
-        'misc/autoupdate.py'),
+     'misc/autoupdate.py'),
     ('tests/unit/misc/test_readline.py',
-        'misc/readline.py'),
+     'misc/readline.py'),
     ('tests/unit/misc/test_split.py',
-        'misc/split.py'),
+     'misc/split.py'),
     ('tests/unit/misc/test_msgbox.py',
-        'misc/msgbox.py'),
+     'misc/msgbox.py'),
     ('tests/unit/misc/test_checkpyver.py',
-        'misc/checkpyver.py'),
+     'misc/checkpyver.py'),
     ('tests/unit/misc/test_guiprocess.py',
-        'misc/guiprocess.py'),
+     'misc/guiprocess.py'),
     ('tests/unit/misc/test_editor.py',
-        'misc/editor.py'),
+     'misc/editor.py'),
     ('tests/unit/misc/test_cmdhistory.py',
-        'misc/cmdhistory.py'),
+     'misc/cmdhistory.py'),
     ('tests/unit/misc/test_ipc.py',
-        'misc/ipc.py'),
+     'misc/ipc.py'),
     ('tests/unit/misc/test_keyhints.py',
-        'misc/keyhintwidget.py'),
+     'misc/keyhintwidget.py'),
     ('tests/unit/misc/test_pastebin.py',
-        'misc/pastebin.py'),
+     'misc/pastebin.py'),
     (None,
-        'misc/objects.py'),
+     'misc/objects.py'),
 
     (None,
-        'mainwindow/statusbar/keystring.py'),
+     'mainwindow/statusbar/keystring.py'),
     ('tests/unit/mainwindow/statusbar/test_percentage.py',
-        'mainwindow/statusbar/percentage.py'),
+     'mainwindow/statusbar/percentage.py'),
     ('tests/unit/mainwindow/statusbar/test_progress.py',
-        'mainwindow/statusbar/progress.py'),
+     'mainwindow/statusbar/progress.py'),
     ('tests/unit/mainwindow/statusbar/test_tabindex.py',
-        'mainwindow/statusbar/tabindex.py'),
+     'mainwindow/statusbar/tabindex.py'),
     ('tests/unit/mainwindow/statusbar/test_textbase.py',
-        'mainwindow/statusbar/textbase.py'),
+     'mainwindow/statusbar/textbase.py'),
     ('tests/unit/mainwindow/statusbar/test_url.py',
-        'mainwindow/statusbar/url.py'),
+     'mainwindow/statusbar/url.py'),
     ('tests/unit/mainwindow/statusbar/test_backforward.py',
-        'mainwindow/statusbar/backforward.py'),
+     'mainwindow/statusbar/backforward.py'),
     ('tests/unit/mainwindow/test_messageview.py',
-        'mainwindow/messageview.py'),
+     'mainwindow/messageview.py'),
 
     ('tests/unit/config/test_config.py',
-        'config/config.py'),
+     'config/config.py'),
     ('tests/unit/config/test_configdata.py',
-        'config/configdata.py'),
+     'config/configdata.py'),
     ('tests/unit/config/test_configexc.py',
-        'config/configexc.py'),
+     'config/configexc.py'),
     ('tests/unit/config/test_configfiles.py',
-        'config/configfiles.py'),
+     'config/configfiles.py'),
     ('tests/unit/config/test_configtypes.py',
-        'config/configtypes.py'),
+     'config/configtypes.py'),
     ('tests/unit/config/test_configinit.py',
-        'config/configinit.py'),
+     'config/configinit.py'),
     ('tests/unit/config/test_configcommands.py',
-        'config/configcommands.py'),
+     'config/configcommands.py'),
 
     ('tests/unit/utils/test_qtutils.py',
-        'utils/qtutils.py'),
+     'utils/qtutils.py'),
     ('tests/unit/utils/test_standarddir.py',
-        'utils/standarddir.py'),
+     'utils/standarddir.py'),
     ('tests/unit/utils/test_urlutils.py',
-        'utils/urlutils.py'),
+     'utils/urlutils.py'),
     ('tests/unit/utils/usertypes',
-        'utils/usertypes.py'),
+     'utils/usertypes.py'),
     ('tests/unit/utils/test_utils.py',
-        'utils/utils.py'),
+     'utils/utils.py'),
     ('tests/unit/utils/test_version.py',
-        'utils/version.py'),
+     'utils/version.py'),
     ('tests/unit/utils/test_debug.py',
-        'utils/debug.py'),
+     'utils/debug.py'),
     ('tests/unit/utils/test_jinja.py',
-        'utils/jinja.py'),
+     'utils/jinja.py'),
     ('tests/unit/utils/test_error.py',
-        'utils/error.py'),
+     'utils/error.py'),
     ('tests/unit/utils/test_javascript.py',
-        'utils/javascript.py'),
+     'utils/javascript.py'),
 
     (None,
-        'completion/models/util.py'),
+     'completion/models/util.py'),
     ('tests/unit/completion/test_models.py',
-        'completion/models/urlmodel.py'),
+     'completion/models/urlmodel.py'),
     ('tests/unit/completion/test_histcategory.py',
-        'completion/models/histcategory.py'),
+     'completion/models/histcategory.py'),
     ('tests/unit/completion/test_listcategory.py',
-        'completion/models/listcategory.py'),
+     'completion/models/listcategory.py'),
 
     ('tests/unit/browser/webengine/test_spell.py',
-        'browser/webengine/spell.py'),
+     'browser/webengine/spell.py'),
 
 ]
 
diff --git a/scripts/dev/recompile_requirements.py b/scripts/dev/recompile_requirements.py
index 4718ca7ab..191f52031 100644
--- a/scripts/dev/recompile_requirements.py
+++ b/scripts/dev/recompile_requirements.py
@@ -33,7 +33,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir,
 from scripts import utils
 
 REPO_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                       '..', '..')  # /scripts/dev -> /scripts -> /
+                        '..', '..')  # /scripts/dev -> /scripts -> /
 REQ_DIR = os.path.join(REPO_DIR, 'misc', 'requirements')
 
 
@@ -118,9 +118,9 @@ def main():
             pip_bin = os.path.join(tmpdir, 'bin', 'pip')
             subprocess.run(['virtualenv', tmpdir], check=True)
             subprocess.run([pip_bin, 'install', '-r', filename], check=True)
-            reqs = subprocess.run([pip_bin, 'freeze'], check=True,
-                                  stdout=subprocess.PIPE
-                                  ).stdout.decode('utf-8')
+            proc = subprocess.run([pip_bin, 'freeze'], check=True,
+                                  stdout=subprocess.PIPE)
+            reqs = proc.stdout.decode('utf-8')
 
         with open(filename, 'r', encoding='utf-8') as f:
             comments = read_comments(f)
diff --git a/scripts/dev/src2asciidoc.py b/scripts/dev/src2asciidoc.py
index 1470103ab..6f4352d77 100755
--- a/scripts/dev/src2asciidoc.py
+++ b/scripts/dev/src2asciidoc.py
@@ -257,7 +257,7 @@ def _get_command_doc_count(cmd, parser):
                 yield parser.arg_descs[param.name]
             except KeyError as e:
                 raise KeyError("No description for count arg {!r} of command "
-                              "{!r}!".format(param.name, cmd.name)) from e
+                               "{!r}!".format(param.name, cmd.name)) from e
 
 
 def _get_command_doc_notes(cmd):
diff --git a/scripts/dictcli.py b/scripts/dictcli.py
index 201657a3c..796544365 100755
--- a/scripts/dictcli.py
+++ b/scripts/dictcli.py
@@ -99,16 +99,17 @@ def get_argparser():
     subparsers = parser.add_subparsers(help='Command', dest='cmd')
     subparsers.required = True
     subparsers.add_parser('list',
-        help='Display the list of available languages.')
+                          help='Display the list of available languages.')
     subparsers.add_parser('update',
-        help='Update dictionaries')
+                          help='Update dictionaries')
     subparsers.add_parser('remove-old',
-        help='Remove old versions of dictionaries.')
+                          help='Remove old versions of dictionaries.')
 
     install_parser = subparsers.add_parser('install',
-        help='Install dictionaries')
+                                           help='Install dictionaries')
     install_parser.add_argument('language',
-        nargs='*', help="A list of languages to install.")
+                                nargs='*',
+                                help="A list of languages to install.")
 
     return parser
 
diff --git a/scripts/importer.py b/scripts/importer.py
index c97188ffe..d81ace0d0 100755
--- a/scripts/importer.py
+++ b/scripts/importer.py
@@ -246,29 +246,29 @@ def import_netscape_bookmarks(bookmarks_file, bookmark_types, output_format):
 def import_moz_places(profile, bookmark_types, output_format):
     """Import bookmarks from a Mozilla profile's places.sqlite database."""
     place_query = {
-        'bookmark':
-        ("SELECT DISTINCT moz_bookmarks.title,moz_places.url "
-         "FROM moz_bookmarks,moz_places "
-         "WHERE moz_places.id=moz_bookmarks.fk "
-         "AND moz_places.id NOT IN (SELECT place_id FROM moz_keywords) "
-         "AND moz_places.url NOT LIKE 'place:%';"
-         ),  # Bookmarks with no keywords assigned
-        'keyword':
-        ("SELECT moz_keywords.keyword,moz_places.url "
-         "FROM moz_keywords,moz_places,moz_bookmarks "
-         "WHERE moz_places.id=moz_bookmarks.fk "
-         "AND moz_places.id=moz_keywords.place_id "
-         "AND moz_places.url NOT LIKE '%!%s%' ESCAPE '!';"
-         ),  # Bookmarks with keywords assigned but no %s substitution
-        'search':
-        ("SELECT moz_keywords.keyword, "
-         "    moz_bookmarks.title, "
-         "    search_conv(moz_places.url) AS url "
-         "FROM moz_keywords,moz_places,moz_bookmarks "
-         "WHERE moz_places.id=moz_bookmarks.fk "
-         "AND moz_places.id=moz_keywords.place_id "
-         "AND moz_places.url LIKE '%!%s%' ESCAPE '!';"
-         )  # bookmarks with keyword and %s substitution
+        'bookmark': (
+            "SELECT DISTINCT moz_bookmarks.title,moz_places.url "
+            "FROM moz_bookmarks,moz_places "
+            "WHERE moz_places.id=moz_bookmarks.fk "
+            "AND moz_places.id NOT IN (SELECT place_id FROM moz_keywords) "
+            "AND moz_places.url NOT LIKE 'place:%';"
+        ),  # Bookmarks with no keywords assigned
+        'keyword': (
+            "SELECT moz_keywords.keyword,moz_places.url "
+            "FROM moz_keywords,moz_places,moz_bookmarks "
+            "WHERE moz_places.id=moz_bookmarks.fk "
+            "AND moz_places.id=moz_keywords.place_id "
+            "AND moz_places.url NOT LIKE '%!%s%' ESCAPE '!';"
+        ),  # Bookmarks with keywords assigned but no %s substitution
+        'search': (
+            "SELECT moz_keywords.keyword, "
+            "    moz_bookmarks.title, "
+            "    search_conv(moz_places.url) AS url "
+            "FROM moz_keywords,moz_places,moz_bookmarks "
+            "WHERE moz_places.id=moz_bookmarks.fk "
+            "AND moz_places.id=moz_keywords.place_id "
+            "AND moz_places.url LIKE '%!%s%' ESCAPE '!';"
+        )  # bookmarks with keyword and %s substitution
     }
     out_template = {
         'bookmark': {
diff --git a/tests/conftest.py b/tests/conftest.py
index 209cb5898..42d7e2c81 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -57,9 +57,9 @@ def _apply_platform_markers(config, item):
         ('mac', not utils.is_mac, "Requires macOS"),
         ('not_mac', utils.is_mac, "Skipped on macOS"),
         ('not_frozen', getattr(sys, 'frozen', False),
-            "Can't be run when frozen"),
+         "Can't be run when frozen"),
         ('frozen', not getattr(sys, 'frozen', False),
-            "Can only run when frozen"),
+         "Can only run when frozen"),
         ('ci', 'CI' not in os.environ, "Only runs on CI."),
         ('no_ci', 'CI' in os.environ, "Skipped on CI."),
         ('issue2478', utils.is_windows and config.webengine,
diff --git a/tests/end2end/features/test_javascript_bdd.py b/tests/end2end/features/test_javascript_bdd.py
index 8f69ef6d4..631a422a5 100644
--- a/tests/end2end/features/test_javascript_bdd.py
+++ b/tests/end2end/features/test_javascript_bdd.py
@@ -65,4 +65,4 @@ def create_greasemonkey_file(quteproc, stage, frameset):
                          "not {}".format(frameset))
     with open(file_path, 'w', encoding='utf-8') as f:
         f.write(test_gm_script.format(stage=stage,
-                                     frames=frames))
+                                      frames=frames))
diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index 7accddc03..05e609fda 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -154,7 +154,7 @@ def is_ignored_chromium_message(line):
         'Invalid node channel message *',
         # Makes tests fail on Quantumcross' machine
         ('CreatePlatformSocket() returned an error, errno=97: Address family'
-            'not supported by protocol'),
+         'not supported by protocol'),
 
         # Qt 5.9 with debug Chromium
 
@@ -169,7 +169,7 @@ def is_ignored_chromium_message(line):
         # /tmp/pytest-of-florian/pytest-32/test_webengine_download_suffix0/
         # downloads/download.bin: Operation not supported
         ('Could not set extended attribute user.xdg.* on file *: '
-            'Operation not supported'),
+         'Operation not supported'),
         # [5947:5947:0605/192837.856931:ERROR:render_process_impl.cc(112)]
         # WebFrame LEAKED 1 TIMES
         'WebFrame LEAKED 1 TIMES',
@@ -357,9 +357,10 @@ class QuteProc(testprocess.Process):
             if not self._load_ready:
                 log_line.waited_for = True
             self._is_ready('load')
-        elif log_line.category == 'misc' and any(testutils.pattern_match(
-                pattern=pattern, value=log_line.message) for pattern in
-                start_okay_messages_focus):
+        elif (log_line.category == 'misc' and any(
+                testutils.pattern_match(pattern=pattern,
+                                        value=log_line.message)
+                for pattern in start_okay_messages_focus)):
             self._is_ready('focus')
         elif (log_line.category == 'init' and
               log_line.module == 'standarddir' and
diff --git a/tests/end2end/fixtures/test_quteprocess.py b/tests/end2end/fixtures/test_quteprocess.py
index b537960f4..f8241397f 100644
--- a/tests/end2end/fixtures/test_quteprocess.py
+++ b/tests/end2end/fixtures/test_quteprocess.py
@@ -241,8 +241,8 @@ def test_log_line_parse(data, attrs):
     pytest.param(
         {'created': 86400, 'msecs': 0, 'levelname': 'DEBUG', 'name': 'foo',
          'module': 'bar', 'funcName': 'qux', 'lineno': 10, 'levelno': 10,
-         'message': 'quux', 'traceback': 'Traceback (most recent call '
-         'last):\n here be dragons'},
+         'message': 'quux', 'traceback': ('Traceback (most recent call '
+                                          'last):\n here be dragons')},
         False, False,
         '{timestamp} DEBUG    foo        bar:qux:10 quux\n'
         'Traceback (most recent call last):\n'
diff --git a/tests/end2end/test_hints_html.py b/tests/end2end/test_hints_html.py
index abc106505..6654e1388 100644
--- a/tests/end2end/test_hints_html.py
+++ b/tests/end2end/test_hints_html.py
@@ -71,8 +71,8 @@ def _parse_file(test_name):
     allowed_keys = {'target', 'qtwebengine_todo'}
     if not set(data.keys()).issubset(allowed_keys):
         raise InvalidFile(test_name, "expected keys {} but found {}".format(
-                          ', '.join(allowed_keys),
-                          ', '.join(set(data.keys()))))
+            ', '.join(allowed_keys),
+            ', '.join(set(data.keys()))))
 
     if 'target' not in data:
         raise InvalidFile(test_name, "'target' key not found")
diff --git a/tests/unit/browser/test_history.py b/tests/unit/browser/test_history.py
index 1b706331a..c5734d34a 100644
--- a/tests/unit/browser/test_history.py
+++ b/tests/unit/browser/test_history.py
@@ -153,13 +153,13 @@ def test_delete_url(hist, raw, escaped):
     'url, atime, title, redirect, history_url, completion_url', [
 
         ('http://www.example.com', 12346, 'the title', False,
-            'http://www.example.com', 'http://www.example.com'),
+         'http://www.example.com', 'http://www.example.com'),
         ('http://www.example.com', 12346, 'the title', True,
-            'http://www.example.com', None),
+         'http://www.example.com', None),
         ('http://www.example.com/sp ce', 12346, 'the title', False,
-            'http://www.example.com/sp%20ce', 'http://www.example.com/sp ce'),
+         'http://www.example.com/sp%20ce', 'http://www.example.com/sp ce'),
         ('https://user:pass@example.com', 12346, 'the title', False,
-            'https://user@example.com', 'https://user@example.com'),
+         'https://user@example.com', 'https://user@example.com'),
     ]
 )
 def test_add_url(qtbot, hist, url, atime, title, redirect, history_url,
diff --git a/tests/unit/browser/test_qutescheme.py b/tests/unit/browser/test_qutescheme.py
index 6fdaad83c..e7c6cc9eb 100644
--- a/tests/unit/browser/test_qutescheme.py
+++ b/tests/unit/browser/test_qutescheme.py
@@ -118,7 +118,7 @@ class TestHistoryHandler:
         (72*60*60, 0)
     ])
     def test_qutehistory_data(self, start_time_offset, expected_item_count,
-            now):
+                              now):
         """Ensure qute://history/data returns correct items."""
         start_time = now - start_time_offset
         url = QUrl("qute://history/data?start_time=" + str(start_time))
diff --git a/tests/unit/completion/test_completer.py b/tests/unit/completion/test_completer.py
index 012122937..e25d4e5d1 100644
--- a/tests/unit/completion/test_completer.py
+++ b/tests/unit/completion/test_completer.py
@@ -160,7 +160,7 @@ def _set_cmd_prompt(cmd, txt):
     (':set general editor |', 'value', '', ['general', 'editor']),
     (':set general editor gv|', 'value', 'gv', ['general', 'editor']),
     (':set general editor "gvim -f"|', 'value', 'gvim -f',
-        ['general', 'editor']),
+     ['general', 'editor']),
     (':set general editor "gvim |', 'value', 'gvim', ['general', 'editor']),
     (':set general huh |', 'value', '', ['general', 'huh']),
     (':help |', 'helptopic', '', []),
diff --git a/tests/unit/completion/test_completionmodel.py b/tests/unit/completion/test_completionmodel.py
index 1e88838f3..b0775428f 100644
--- a/tests/unit/completion/test_completionmodel.py
+++ b/tests/unit/completion/test_completionmodel.py
@@ -31,7 +31,8 @@ from qutebrowser.utils import qtutils
 from qutebrowser.commands import cmdexc
 
 
-@hypothesis.given(strategies.lists(min_size=0, max_size=3,
+@hypothesis.given(strategies.lists(
+    min_size=0, max_size=3,
     elements=strategies.integers(min_value=0, max_value=2**31)))
 def test_first_last_item(counts):
     """Test that first() and last() index to the first and last items."""
diff --git a/tests/unit/completion/test_completionwidget.py b/tests/unit/completion/test_completionwidget.py
index a639daf95..ba6e40e4a 100644
--- a/tests/unit/completion/test_completionwidget.py
+++ b/tests/unit/completion/test_completionwidget.py
@@ -82,9 +82,9 @@ def test_maybe_update_geometry(completionview, config_stub, qtbot):
     ('next', [['Aa'], ['Ba']], ['Aa', 'Ba', 'Aa']),
     ('prev', [['Aa'], ['Ba']], ['Ba', 'Aa', 'Ba']),
     ('next', [['Aa', 'Ab', 'Ac'], ['Ba', 'Bb'], ['Ca']],
-        ['Aa', 'Ab', 'Ac', 'Ba', 'Bb', 'Ca', 'Aa']),
+     ['Aa', 'Ab', 'Ac', 'Ba', 'Bb', 'Ca', 'Aa']),
     ('prev', [['Aa', 'Ab', 'Ac'], ['Ba', 'Bb'], ['Ca']],
-        ['Ca', 'Bb', 'Ba', 'Ac', 'Ab', 'Aa', 'Ca']),
+     ['Ca', 'Bb', 'Ba', 'Ac', 'Ab', 'Aa', 'Ca']),
     ('next', [[], ['Ba', 'Bb']], ['Ba', 'Bb', 'Ba']),
     ('prev', [[], ['Ba', 'Bb']], ['Bb', 'Ba', 'Bb']),
     ('next', [[], [], ['Ca', 'Cb']], ['Ca', 'Cb', 'Ca']),
@@ -102,9 +102,9 @@ def test_maybe_update_geometry(completionview, config_stub, qtbot):
     ('next-category', [['Aa'], ['Ba']], ['Aa', 'Ba', 'Aa']),
     ('prev-category', [['Aa'], ['Ba']], ['Ba', 'Aa', 'Ba']),
     ('next-category', [['Aa', 'Ab', 'Ac'], ['Ba', 'Bb'], ['Ca']],
-        ['Aa', 'Ba', 'Ca', 'Aa']),
+     ['Aa', 'Ba', 'Ca', 'Aa']),
     ('prev-category', [['Aa', 'Ab', 'Ac'], ['Ba', 'Bb'], ['Ca']],
-        ['Ca', 'Ba', 'Aa', 'Ca']),
+     ['Ca', 'Ba', 'Aa', 'Ca']),
     ('next-category', [[], ['Ba', 'Bb']], ['Ba', None, None]),
     ('prev-category', [[], ['Ba', 'Bb']], ['Ba', None, None]),
     ('next-category', [[], [], ['Ca', 'Cb']], ['Ca', None, None]),
@@ -170,8 +170,9 @@ def test_completion_item_focus_fetch(completionview, qtbot):
                   emitted.
     """
     model = completionmodel.CompletionModel()
-    cat = mock.Mock(spec=['layoutChanged', 'layoutAboutToBeChanged',
-        'canFetchMore', 'fetchMore', 'rowCount', 'index', 'data'])
+    cat = mock.Mock(spec=[
+        'layoutChanged', 'layoutAboutToBeChanged', 'canFetchMore',
+        'fetchMore', 'rowCount', 'index', 'data'])
     cat.canFetchMore = lambda *_: True
     cat.rowCount = lambda *_: 2
     cat.fetchMore = mock.Mock()
diff --git a/tests/unit/completion/test_models.py b/tests/unit/completion/test_models.py
index c4d224dcc..1a0fe57b0 100644
--- a/tests/unit/completion/test_models.py
+++ b/tests/unit/completion/test_models.py
@@ -627,7 +627,7 @@ def test_window_completion(qtmodeltester, fake_web_tab, tabbed_browser_stubs,
     _check_completions(model, {
         'Windows': [
             ('0', 'window title - qutebrowser',
-                'GitHub, Wikipedia, DuckDuckGo'),
+             'GitHub, Wikipedia, DuckDuckGo'),
         ]
     })
 
@@ -642,11 +642,11 @@ def test_setting_option_completion(qtmodeltester, config_stub,
     _check_completions(model, {
         "Options": [
             ('aliases', 'Aliases for commands.', '{"q": "quit"}'),
-            ('bindings.commands', 'Default keybindings',
+            ('bindings.commands', 'Default keybindings', (
                 '{"normal": {"<ctrl+q>": "quit", "ZQ": "quit", '
-                '"I": "invalid", "d": "scroll down"}}'),
+                '"I": "invalid", "d": "scroll down"}}')),
             ('bindings.default', 'Default keybindings',
-                '{"normal": {"<ctrl+q>": "quit", "d": "tab-close"}}'),
+             '{"normal": {"<ctrl+q>": "quit", "d": "tab-close"}}'),
         ]
     })
 
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 63dc5b8b6..e195f720c 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -213,7 +213,7 @@ class TestYaml:
         ('%', 'While parsing', 'while scanning a directive'),
         ('global: 42', 'While loading data', "'global' object is not a dict"),
         ('foo: 42', 'While loading data',
-        "Toplevel object does not contain 'global' key"),
+         "Toplevel object does not contain 'global' key"),
         ('42', 'While loading data', "Toplevel object is not a dict"),
     ])
     def test_invalid(self, yaml, config_tmpdir, line, text, exception):
@@ -318,8 +318,9 @@ class TestConfigPyModules:
         sys.path = old_path
 
     def test_bind_in_module(self, confpy, qbmodulepy, tmpdir):
-        qbmodulepy.write('def run(config):',
-        '    config.bind(",a", "message-info foo", mode="normal")')
+        qbmodulepy.write(
+            'def run(config):',
+            '    config.bind(",a", "message-info foo", mode="normal")')
         confpy.write_qbmodule()
         confpy.read()
         expected = {'normal': {',a': 'message-info foo'}}
diff --git a/tests/unit/config/test_configinit.py b/tests/unit/config/test_configinit.py
index 354920258..79ac43219 100644
--- a/tests/unit/config/test_configinit.py
+++ b/tests/unit/config/test_configinit.py
@@ -143,11 +143,11 @@ class TestEarlyInit:
             suffix = ' (autoconfig.yml)' if config_py else ''
             if invalid_yaml == '42':
                 error = ("While loading data{}: Toplevel object is not a dict"
-                        .format(suffix))
+                         .format(suffix))
                 expected_errors.append(error)
             elif invalid_yaml == 'wrong-type':
                 error = ("Error{}: Invalid value 'True' - expected a value of "
-                        "type str but got bool.".format(suffix))
+                         "type str but got bool.".format(suffix))
                 expected_errors.append(error)
             elif invalid_yaml == 'unknown':
                 error = ("While loading options{}: Unknown option "
diff --git a/tests/unit/config/test_configtypes.py b/tests/unit/config/test_configtypes.py
index 1a4360479..556b3f9e2 100644
--- a/tests/unit/config/test_configtypes.py
+++ b/tests/unit/config/test_configtypes.py
@@ -340,13 +340,13 @@ class TestBaseType:
     @pytest.mark.parametrize('valid_values, completions', [
         # Without description
         (['foo', 'bar'],
-            [('foo', ''), ('bar', '')]),
+         [('foo', ''), ('bar', '')]),
         # With description
         ([('foo', "foo desc"), ('bar', "bar desc")],
-            [('foo', "foo desc"), ('bar', "bar desc")]),
+         [('foo', "foo desc"), ('bar', "bar desc")]),
         # With mixed description
         ([('foo', "foo desc"), 'bar'],
-            [('foo', "foo desc"), ('bar', "")]),
+         [('foo', "foo desc"), ('bar', "")]),
     ])
     def test_complete_without_desc(self, klass, valid_values, completions):
         """Test complete with valid_values set without description."""
@@ -489,9 +489,9 @@ class TestString:
 
     @pytest.mark.parametrize('valid_values, expected', [
         (configtypes.ValidValues('one', 'two'),
-            [('one', ''), ('two', '')]),
+         [('one', ''), ('two', '')]),
         (configtypes.ValidValues(('1', 'one'), ('2', 'two')),
-            [('1', 'one'), ('2', 'two')]),
+         [('1', 'one'), ('2', 'two')]),
     ])
     def test_complete_valid_values(self, klass, valid_values, expected):
         assert klass(valid_values=valid_values).complete() == expected
@@ -1853,14 +1853,14 @@ class TestProxy:
         ('system', configtypes.SYSTEM_PROXY),
         ('none', QNetworkProxy(QNetworkProxy.NoProxy)),
         ('socks://example.com/',
-            QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com')),
+         QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com')),
         ('socks5://foo:bar@example.com:2323',
-            QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com', 2323,
-                          'foo', 'bar')),
+         QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com', 2323,
+                       'foo', 'bar')),
         ('pac+http://example.com/proxy.pac',
-            pac.PACFetcher(QUrl('pac+http://example.com/proxy.pac'))),
+         pac.PACFetcher(QUrl('pac+http://example.com/proxy.pac'))),
         ('pac+file:///tmp/proxy.pac',
-            pac.PACFetcher(QUrl('pac+file:///tmp/proxy.pac'))),
+         pac.PACFetcher(QUrl('pac+file:///tmp/proxy.pac'))),
     ])
     def test_to_py_valid(self, klass, val, expected):
         actual = klass().to_py(val)
diff --git a/tests/unit/misc/test_ipc.py b/tests/unit/misc/test_ipc.py
index 281bd4ac4..fdb03cfd9 100644
--- a/tests/unit/misc/test_ipc.py
+++ b/tests/unit/misc/test_ipc.py
@@ -461,11 +461,11 @@ NEW_VERSION = str(ipc.PROTOCOL_VERSION + 1).encode('utf-8')
     (b'{"valid json without args": true}\n', 'Missing args'),
     (b'{"args": []}\n', 'Missing target_arg'),
     (b'{"args": [], "target_arg": null, "protocol_version": ' + OLD_VERSION +
-        b'}\n', 'incompatible version'),
+     b'}\n', 'incompatible version'),
     (b'{"args": [], "target_arg": null, "protocol_version": ' + NEW_VERSION +
-        b'}\n', 'incompatible version'),
+     b'}\n', 'incompatible version'),
     (b'{"args": [], "target_arg": null, "protocol_version": "foo"}\n',
-        'invalid version'),
+     'invalid version'),
     (b'{"args": [], "target_arg": null}\n', 'invalid version'),
 ])
 def test_invalid_data(qtbot, ipc_server, connected_socket, caplog, data, msg):
@@ -672,9 +672,9 @@ class TestSendOrListen:
 
     @pytest.mark.parametrize('has_error, exc_name, exc_msg', [
         (True, 'SocketError',
-            'Error while writing to running instance: Error string (error 0)'),
+         'Error while writing to running instance: Error string (error 0)'),
         (False, 'AddressInUseError',
-            'Error while listening to IPC server: Error string (error 8)'),
+         'Error while listening to IPC server: Error string (error 8)'),
     ])
     def test_address_in_use_error(self, qlocalserver_mock, qlocalsocket_mock,
                                   stubs, caplog, args, has_error, exc_name,
@@ -737,7 +737,7 @@ class TestSendOrListen:
             'pre_text: ',
             'post_text: Maybe another instance is running but frozen?',
             ('exception text: Error while listening to IPC server: Error '
-                'string (error 4)'),
+             'string (error 4)'),
         ]
         assert caplog.records[-1].msg == '\n'.join(error_msgs)
 
diff --git a/tests/unit/misc/test_miscwidgets.py b/tests/unit/misc/test_miscwidgets.py
index 3e2261cc0..1ee351a81 100644
--- a/tests/unit/misc/test_miscwidgets.py
+++ b/tests/unit/misc/test_miscwidgets.py
@@ -106,7 +106,7 @@ class TestFullscreenNotification:
 
     @pytest.mark.parametrize('bindings, text', [
         ({'<escape>': 'fullscreen --leave'},
-            "Press Escape to exit fullscreen."),
+         "Press Escape to exit fullscreen."),
         ({'<escape>': 'fullscreen'}, "Page is now fullscreen."),
         ({'a': 'fullscreen --leave'}, "Press a to exit fullscreen."),
         ({}, "Page is now fullscreen."),
diff --git a/tests/unit/misc/test_sql.py b/tests/unit/misc/test_sql.py
index 8df08adc3..048826513 100644
--- a/tests/unit/misc/test_sql.py
+++ b/tests/unit/misc/test_sql.py
@@ -157,13 +157,13 @@ def test_iter():
 
 @pytest.mark.parametrize('rows, sort_by, sort_order, limit, result', [
     ([{"a": 2, "b": 5}, {"a": 1, "b": 6}, {"a": 3, "b": 4}], 'a', 'asc', 5,
-        [(1, 6), (2, 5), (3, 4)]),
+     [(1, 6), (2, 5), (3, 4)]),
     ([{"a": 2, "b": 5}, {"a": 1, "b": 6}, {"a": 3, "b": 4}], 'a', 'desc', 3,
-        [(3, 4), (2, 5), (1, 6)]),
+     [(3, 4), (2, 5), (1, 6)]),
     ([{"a": 2, "b": 5}, {"a": 1, "b": 6}, {"a": 3, "b": 4}], 'b', 'desc', 2,
-        [(1, 6), (2, 5)]),
+     [(1, 6), (2, 5)]),
     ([{"a": 2, "b": 5}, {"a": 1, "b": 6}, {"a": 3, "b": 4}], 'a', 'asc', -1,
-        [(1, 6), (2, 5), (3, 4)]),
+     [(1, 6), (2, 5), (3, 4)]),
 ])
 def test_select(rows, sort_by, sort_order, limit, result):
     table = sql.SqlTable('Foo', ['a', 'b'])
diff --git a/tests/unit/scripts/test_importer.py b/tests/unit/scripts/test_importer.py
index 9edab7600..7c9ada1c4 100644
--- a/tests/unit/scripts/test_importer.py
+++ b/tests/unit/scripts/test_importer.py
@@ -27,28 +27,22 @@ _samples = 'tests/unit/scripts/importer_sample'
 
 def qm_expected(input_format):
     """Read expected quickmark-formatted output."""
-    with open(
-            os.path.join(_samples, input_format, 'quickmarks'),
-            'r',
-            encoding='utf-8') as f:
+    with open(os.path.join(_samples, input_format, 'quickmarks'),
+              'r', encoding='utf-8') as f:
         return f.read()
 
 
 def bm_expected(input_format):
     """Read expected bookmark-formatted output."""
-    with open(
-            os.path.join(_samples, input_format, 'bookmarks'),
-            'r',
-            encoding='utf-8') as f:
+    with open(os.path.join(_samples, input_format, 'bookmarks'),
+              'r', encoding='utf-8') as f:
         return f.read()
 
 
 def search_expected(input_format):
     """Read expected search-formatted (config.py) output."""
-    with open(
-            os.path.join(_samples, input_format, 'config_py'),
-            'r',
-            encoding='utf-8') as f:
+    with open(os.path.join(_samples, input_format, 'config_py'),
+              'r', encoding='utf-8') as f:
         return f.read()
 
 
diff --git a/tests/unit/utils/test_qtutils.py b/tests/unit/utils/test_qtutils.py
index d580d677a..b817eeed0 100644
--- a/tests/unit/utils/test_qtutils.py
+++ b/tests/unit/utils/test_qtutils.py
@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
+
 """Tests for qutebrowser.utils.qtutils."""
 
 import io
@@ -40,6 +41,7 @@ from qutebrowser.utils import qtutils, utils
 import overflow_test_cases
 
 
+# pylint: disable=bad-continuation
 @pytest.mark.parametrize(['qversion', 'compiled', 'pyqt', 'version', 'exact',
                           'expected'], [
     # equal versions
@@ -61,6 +63,7 @@ import overflow_test_cases
     # all up-to-date
     ('5.4.0', '5.4.0', '5.4.0', '5.4.0', False, True),
 ])
+# pylint: enable=bad-continuation
 def test_version_check(monkeypatch, qversion, compiled, pyqt, version, exact,
                        expected):
     """Test for version_check().
diff --git a/tests/unit/utils/test_urlutils.py b/tests/unit/utils/test_urlutils.py
index cbfc31055..4d9b3ba0a 100644
--- a/tests/unit/utils/test_urlutils.py
+++ b/tests/unit/utils/test_urlutils.py
@@ -492,18 +492,14 @@ def test_filename_from_url(qurl, output):
     (QUrl('qute://'), None),
     (QUrl('qute://foobar'), None),
     (QUrl('mailto:nobody'), None),
-    (QUrl('ftp://example.com/'),
-        ('ftp', 'example.com', 21)),
-    (QUrl('ftp://example.com:2121/'),
-        ('ftp', 'example.com', 2121)),
+    (QUrl('ftp://example.com/'), ('ftp', 'example.com', 21)),
+    (QUrl('ftp://example.com:2121/'), ('ftp', 'example.com', 2121)),
     (QUrl('http://qutebrowser.org:8010/waterfall'),
-        ('http', 'qutebrowser.org', 8010)),
-    (QUrl('https://example.com/'),
-        ('https', 'example.com', 443)),
-    (QUrl('https://example.com:4343/'),
-        ('https', 'example.com', 4343)),
+     ('http', 'qutebrowser.org', 8010)),
+    (QUrl('https://example.com/'), ('https', 'example.com', 443)),
+    (QUrl('https://example.com:4343/'), ('https', 'example.com', 4343)),
     (QUrl('http://user:password@qutebrowser.org/foo?bar=baz#fish'),
-        ('http', 'qutebrowser.org', 80)),
+     ('http', 'qutebrowser.org', 80)),
 ])
 def test_host_tuple(qurl, tpl):
     """Test host_tuple().
@@ -752,7 +748,7 @@ def test_data_url():
     (QUrl('http://www.example.com/ä'), 'http://www.example.com/ä'),
     # Unicode only in TLD (looks like Qt shows Punycode with рф...)
     (QUrl('http://www.example.xn--p1ai'),
-        '(www.example.xn--p1ai) http://www.example.рф'),
+     '(www.example.xn--p1ai) http://www.example.рф'),
     # https://bugreports.qt.io/browse/QTBUG-60364
     pytest.param(QUrl('http://www.xn--80ak6aa92e.com'),
                  '(unparseable URL!) http://www.аррӏе.com',
@@ -779,19 +775,19 @@ class TestProxyFromUrl:
 
     @pytest.mark.parametrize('url, expected', [
         ('socks://example.com/',
-            QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com')),
+         QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com')),
         ('socks5://example.com',
-            QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com')),
+         QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com')),
         ('socks5://example.com:2342',
-            QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com', 2342)),
+         QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com', 2342)),
         ('socks5://foo@example.com',
-            QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com', 0, 'foo')),
+         QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com', 0, 'foo')),
         ('socks5://foo:bar@example.com',
-            QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com', 0, 'foo',
-                          'bar')),
+         QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com', 0, 'foo',
+                       'bar')),
         ('socks5://foo:bar@example.com:2323',
-            QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com', 2323,
-                          'foo', 'bar')),
+         QNetworkProxy(QNetworkProxy.Socks5Proxy, 'example.com', 2323,
+                       'foo', 'bar')),
         ('direct://', QNetworkProxy(QNetworkProxy.NoProxy)),
     ])
     def test_proxy_from_url_valid(self, url, expected):
diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py
index 66f5e852d..28837e93c 100644
--- a/tests/unit/utils/test_utils.py
+++ b/tests/unit/utils/test_utils.py
@@ -376,7 +376,7 @@ class TestKeyEventToString:
     ('<Control-x>', utils.KeyInfo(Qt.Key_X, Qt.ControlModifier, '')),
     ('<Meta-x>', utils.KeyInfo(Qt.Key_X, Qt.MetaModifier, '')),
     ('<Ctrl-Alt-y>',
-        utils.KeyInfo(Qt.Key_Y, Qt.ControlModifier | Qt.AltModifier, '')),
+     utils.KeyInfo(Qt.Key_Y, Qt.ControlModifier | Qt.AltModifier, '')),
     ('x', utils.KeyInfo(Qt.Key_X, Qt.NoModifier, 'x')),
     ('X', utils.KeyInfo(Qt.Key_X, Qt.ShiftModifier, 'X')),
     ('<Escape>', utils.KeyInfo(Qt.Key_Escape, Qt.NoModifier, '')),
diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index 620e0688a..aa9df5419 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -467,12 +467,12 @@ def test_path_info(monkeypatch, equal):
         equal: Whether system data / data and system config / config are equal.
     """
     patches = {
-        'config': lambda auto=False:
+        'config': lambda auto=False: (
             'AUTO CONFIG PATH' if auto and not equal
-            else 'CONFIG PATH',
-        'data': lambda system=False:
+            else 'CONFIG PATH'),
+        'data': lambda system=False: (
             'SYSTEM DATA PATH' if system and not equal
-            else 'DATA PATH',
+            else 'DATA PATH'),
         'cache': lambda: 'CACHE PATH',
         'runtime': lambda: 'RUNTIME PATH',
     }

From 21bf44614770a91ce62ef0a5fa8e497b921e17de Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 20:04:44 +0100
Subject: [PATCH 224/322] Reorder pylint ignores

---
 .pylintrc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index 00e206fb5..f0429f322 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -13,24 +13,24 @@ persistent=n
 
 [MESSAGES CONTROL]
 enable=all
-disable=fixme,
+disable=locally-disabled,
+        locally-enabled,
+        suppressed-message,
+        fixme,
         no-self-use,
         cyclic-import,
         blacklisted-name,
         logging-format-interpolation,
+        logging-not-lazy,
         broad-except,
         bare-except,
         eval-used,
         exec-used,
         global-statement,
         ungrouped-imports,
-        suppressed-message,
-        duplicate-code,
         wrong-import-position,
+        duplicate-code,
         no-else-return,
-        logging-not-lazy,
-        locally-disabled,
-        locally-enabled,
         too-many-ancestors,
         too-many-public-methods,
         too-many-instance-attributes,

From f5dd392701d130865fc3965a03fe4f216fd0aec9 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 23:00:06 +0100
Subject: [PATCH 225/322] Regenerate docs

---
 doc/help/commands.asciidoc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index ed0769683..098ada8af 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -516,7 +516,7 @@ Show help about a command or setting.
 
 [[hint]]
 === hint
-Syntax: +:hint [*--rapid*] [*--mode* 'mode'] [*--add-history*]
+Syntax: +:hint [*--mode* 'mode'] [*--add-history*] [*--rapid*]
      ['group'] ['target'] ['args' ['args' ...]]+
 
 Start hinting.
@@ -570,11 +570,6 @@ Start hinting.
 
 
 ==== optional arguments
-* +*-r*+, +*--rapid*+: Whether to do rapid hinting. With rapid hinting, the hint mode isn't left after a hint is followed, so you can easily
- open multiple links. This is only possible with targets
- `tab` (with `tabs.background_tabs=true`), `tab-bg`,
- `window`, `run`, `hover`, `userscript` and `spawn`.
-
 * +*-m*+, +*--mode*+: The hinting mode to use. 
 
  - `number`: Use numeric hints.
@@ -586,6 +581,11 @@ Start hinting.
 
 * +*-a*+, +*--add-history*+: Whether to add the spawned or yanked link to the browsing history.
 
+* +*-r*+, +*--rapid*+: Whether to do rapid hinting. With rapid hinting, the hint mode isn't left after a hint is followed, so you can easily
+ open multiple links. This is only possible with targets
+ `tab` (with `tabs.background_tabs=true`), `tab-bg`,
+ `window`, `run`, `hover`, `userscript` and `spawn`.
+
 
 ==== note
 * This command does not split arguments after the last argument and handles quotes literally.

From 430126dcc8d0d6872d9a226959172d6cf6e9cdc0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 23:08:53 +0100
Subject: [PATCH 226/322] pylint: Re-enable ungrouped-imports

---
 .pylintrc                             | 1 -
 qutebrowser/browser/urlmarks.py       | 2 +-
 qutebrowser/misc/crashsignal.py       | 2 +-
 qutebrowser/utils/standarddir.py      | 2 +-
 qutebrowser/utils/utils.py            | 2 +-
 scripts/dev/build_release.py          | 2 +-
 scripts/dev/check_coverage.py         | 2 +-
 scripts/dev/get_coredumpctl_traces.py | 2 +-
 scripts/dev/misc_checks.py            | 2 +-
 scripts/dev/run_pylint_on_tests.py    | 2 +-
 scripts/dev/segfault_test.py          | 2 +-
 scripts/dev/src2asciidoc.py           | 4 ++--
 scripts/link_pyqt.py                  | 2 +-
 tests/end2end/conftest.py             | 2 +-
 tests/end2end/fixtures/quteprocess.py | 2 +-
 tests/end2end/test_mhtml_e2e.py       | 2 +-
 tests/unit/javascript/conftest.py     | 9 ++++-----
 tests/unit/scripts/test_dictcli.py    | 2 +-
 tests/unit/utils/test_standarddir.py  | 2 +-
 19 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index f0429f322..a79f7797e 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -27,7 +27,6 @@ disable=locally-disabled,
         eval-used,
         exec-used,
         global-statement,
-        ungrouped-imports,
         wrong-import-position,
         duplicate-code,
         no-else-return,
diff --git a/qutebrowser/browser/urlmarks.py b/qutebrowser/browser/urlmarks.py
index b7c93a994..5e2c60dfb 100644
--- a/qutebrowser/browser/urlmarks.py
+++ b/qutebrowser/browser/urlmarks.py
@@ -26,8 +26,8 @@ to a file on shutdown, so it makes sense to keep them as strings here.
 """
 
 import os
-import html
 import os.path
+import html
 import functools
 import collections
 
diff --git a/qutebrowser/misc/crashsignal.py b/qutebrowser/misc/crashsignal.py
index 60ef2fbad..b8d63ad58 100644
--- a/qutebrowser/misc/crashsignal.py
+++ b/qutebrowser/misc/crashsignal.py
@@ -20,13 +20,13 @@
 """Handlers for crashes and OS signals."""
 
 import os
+import os.path
 import sys
 import bdb
 import pdb  # noqa: T002
 import signal
 import functools
 import faulthandler
-import os.path
 try:
     # WORKAROUND for segfaults when using pdb in pytest for some reason...
     import readline  # pylint: disable=unused-import
diff --git a/qutebrowser/utils/standarddir.py b/qutebrowser/utils/standarddir.py
index 1efd47590..64f7eb9a8 100644
--- a/qutebrowser/utils/standarddir.py
+++ b/qutebrowser/utils/standarddir.py
@@ -20,9 +20,9 @@
 """Utilities to get and initialize data/config paths."""
 
 import os
+import os.path
 import sys
 import shutil
-import os.path
 import contextlib
 import enum
 
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index b277ccb77..f29db578e 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -20,12 +20,12 @@
 """Other utilities which don't fit anywhere else."""
 
 import os
+import os.path
 import io
 import re
 import sys
 import enum
 import json
-import os.path
 import collections
 import datetime
 import traceback
diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py
index e12ff5c93..ce0ea2b8e 100755
--- a/scripts/dev/build_release.py
+++ b/scripts/dev/build_release.py
@@ -22,9 +22,9 @@
 
 
 import os
+import os.path
 import sys
 import glob
-import os.path
 import shutil
 import plistlib
 import subprocess
diff --git a/scripts/dev/check_coverage.py b/scripts/dev/check_coverage.py
index 49055dad2..8ec4f80f7 100644
--- a/scripts/dev/check_coverage.py
+++ b/scripts/dev/check_coverage.py
@@ -21,9 +21,9 @@
 """Enforce perfect coverage on some files."""
 
 import os
+import os.path
 import sys
 import enum
-import os.path
 import subprocess
 from xml.etree import ElementTree
 
diff --git a/scripts/dev/get_coredumpctl_traces.py b/scripts/dev/get_coredumpctl_traces.py
index 711bc52c0..3935abdc8 100644
--- a/scripts/dev/get_coredumpctl_traces.py
+++ b/scripts/dev/get_coredumpctl_traces.py
@@ -21,10 +21,10 @@
 """Get qutebrowser crash information and stacktraces from coredumpctl."""
 
 import os
+import os.path
 import sys
 import argparse
 import subprocess
-import os.path
 import tempfile
 
 import attr
diff --git a/scripts/dev/misc_checks.py b/scripts/dev/misc_checks.py
index e1517391d..c04a35f1a 100644
--- a/scripts/dev/misc_checks.py
+++ b/scripts/dev/misc_checks.py
@@ -21,9 +21,9 @@
 """Various small code checkers."""
 
 import os
+import os.path
 import re
 import sys
-import os.path
 import argparse
 import subprocess
 import tokenize
diff --git a/scripts/dev/run_pylint_on_tests.py b/scripts/dev/run_pylint_on_tests.py
index 1f99aa362..198d1e0e6 100644
--- a/scripts/dev/run_pylint_on_tests.py
+++ b/scripts/dev/run_pylint_on_tests.py
@@ -25,8 +25,8 @@ https://bitbucket.org/logilab/pylint/issue/512/
 """
 
 import os
-import sys
 import os.path
+import sys
 import subprocess
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir,
diff --git a/scripts/dev/segfault_test.py b/scripts/dev/segfault_test.py
index 642bb837d..efd60c232 100755
--- a/scripts/dev/segfault_test.py
+++ b/scripts/dev/segfault_test.py
@@ -21,10 +21,10 @@
 """Tester for Qt segfaults with different harfbuzz engines."""
 
 import os
+import os.path
 import signal
 import sys
 import subprocess
-import os.path
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir,
                                 os.pardir))
diff --git a/scripts/dev/src2asciidoc.py b/scripts/dev/src2asciidoc.py
index 6f4352d77..803280deb 100755
--- a/scripts/dev/src2asciidoc.py
+++ b/scripts/dev/src2asciidoc.py
@@ -21,9 +21,9 @@
 """Generate asciidoc source for qutebrowser based on docstrings."""
 
 import os
+import os.path
 import sys
 import shutil
-import os.path
 import inspect
 import subprocess
 import tempfile
@@ -34,11 +34,11 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir,
 
 # We import qutebrowser.app so all @cmdutils-register decorators are run.
 import qutebrowser.app
-from scripts import asciidoc2html, utils
 from qutebrowser import qutebrowser, commands
 from qutebrowser.commands import cmdutils, argparser
 from qutebrowser.config import configdata, configtypes
 from qutebrowser.utils import docutils, usertypes
+from scripts import asciidoc2html, utils
 
 FILE_HEADER = """
 // DO NOT EDIT THIS FILE DIRECTLY!
diff --git a/scripts/link_pyqt.py b/scripts/link_pyqt.py
index ad7d45383..02f979137 100644
--- a/scripts/link_pyqt.py
+++ b/scripts/link_pyqt.py
@@ -21,9 +21,9 @@
 """Symlink PyQt into a given virtualenv."""
 
 import os
+import os.path
 import argparse
 import shutil
-import os.path
 import sys
 import subprocess
 import tempfile
diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py
index 309793ddc..084f5439d 100644
--- a/tests/end2end/conftest.py
+++ b/tests/end2end/conftest.py
@@ -23,10 +23,10 @@
 
 import re
 import os
+import os.path
 import sys
 import shutil
 import pstats
-import os.path
 import operator
 
 import pytest
diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index 05e609fda..3f5e727e6 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -20,10 +20,10 @@
 """Fixtures to run qutebrowser in a QProcess and communicate."""
 
 import os
+import os.path
 import re
 import sys
 import time
-import os.path
 import datetime
 import logging
 import tempfile
diff --git a/tests/end2end/test_mhtml_e2e.py b/tests/end2end/test_mhtml_e2e.py
index 4317271f5..012c2ea2a 100644
--- a/tests/end2end/test_mhtml_e2e.py
+++ b/tests/end2end/test_mhtml_e2e.py
@@ -20,8 +20,8 @@
 """Test mhtml downloads based on sample files."""
 
 import os
-import re
 import os.path
+import re
 import collections
 
 import pytest
diff --git a/tests/unit/javascript/conftest.py b/tests/unit/javascript/conftest.py
index 8490a5362..c5c384c26 100644
--- a/tests/unit/javascript/conftest.py
+++ b/tests/unit/javascript/conftest.py
@@ -27,11 +27,6 @@ import pytest
 import jinja2
 
 from PyQt5.QtCore import QUrl
-
-import helpers.utils
-import qutebrowser.utils.debug
-from qutebrowser.utils import utils
-
 try:
     from PyQt5.QtWebKit import QWebSettings
     from PyQt5.QtWebKitWidgets import QWebPage
@@ -49,6 +44,10 @@ except ImportError:
     QWebEngineSettings = None
     QWebEngineScript = None
 
+import helpers.utils
+import qutebrowser.utils.debug
+from qutebrowser.utils import utils
+
 
 if QWebPage is None:
     TestWebPage = None
diff --git a/tests/unit/scripts/test_dictcli.py b/tests/unit/scripts/test_dictcli.py
index e5408ef68..3471251ba 100644
--- a/tests/unit/scripts/test_dictcli.py
+++ b/tests/unit/scripts/test_dictcli.py
@@ -22,8 +22,8 @@ import py.path  # pylint: disable=no-name-in-module
 import pytest
 
 from qutebrowser.browser.webengine import spell
-from scripts import dictcli
 from qutebrowser.config import configdata
+from scripts import dictcli
 
 
 def afrikaans():
diff --git a/tests/unit/utils/test_standarddir.py b/tests/unit/utils/test_standarddir.py
index 5a3f74a66..e13b5e917 100644
--- a/tests/unit/utils/test_standarddir.py
+++ b/tests/unit/utils/test_standarddir.py
@@ -20,9 +20,9 @@
 """Tests for qutebrowser.utils.standarddir."""
 
 import os
+import os.path
 import sys
 import json
-import os.path
 import types
 import textwrap
 import logging

From c506ffa4cd07db6326280d11340963da64fca05e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 23:17:28 +0100
Subject: [PATCH 227/322] pylint: More config adjustments

---
 .pylintrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pylintrc b/.pylintrc
index a79f7797e..b654355c2 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -68,10 +68,10 @@ valid-metaclass-classmethod-first-arg=cls
 
 [TYPECHECK]
 ignored-modules=PyQt5,PyQt5.QtWebKit
-ignored-classes=_CountingAttr
 
 [IMPORTS]
 # WORKAROUND
 # For some reason, pylint doesn't know about some Python 3 modules on
 # AppVeyor...
 known-standard-library=faulthandler,http,enum,tokenize,posixpath,importlib,types
+known-third-party=sip

From b8a5c04b69b2d5d4ac7989becb962dd5d134985f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 23:20:09 +0100
Subject: [PATCH 228/322] Clean up run_pylint_on_tests

---
 scripts/dev/run_pylint_on_tests.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scripts/dev/run_pylint_on_tests.py b/scripts/dev/run_pylint_on_tests.py
index 198d1e0e6..3dba0318d 100644
--- a/scripts/dev/run_pylint_on_tests.py
+++ b/scripts/dev/run_pylint_on_tests.py
@@ -49,12 +49,12 @@ def main():
                 files.append(os.path.join(dirpath, fn))
 
     disabled = [
+        # pytest fixtures
         'redefined-outer-name',
         'unused-argument',
+        # things which are okay in tests
         'missing-docstring',
         'protected-access',
-        # https://bitbucket.org/logilab/pylint/issue/511/
-        #'undefined-variable',
         'len-as-condition',
         # directories without __init__.py...
         'import-error',
@@ -65,9 +65,7 @@ def main():
         toxinidir,
     ]
 
-    no_docstring_rgx = ['^__.*__$', '^setup$']
     args = (['--disable={}'.format(','.join(disabled)),
-             '--no-docstring-rgx=({})'.format('|'.join(no_docstring_rgx)),
              '--ignored-modules=helpers,pytest,PyQt5'] +
             sys.argv[2:] + files)
     env = os.environ.copy()

From d03e3147626e70723d8156e833617f02fc1522f9 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Dec 2017 23:26:18 +0100
Subject: [PATCH 229/322] Explain eslint philosophy

---
 qutebrowser/javascript/.eslintrc.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/qutebrowser/javascript/.eslintrc.yaml b/qutebrowser/javascript/.eslintrc.yaml
index b29deaa75..6fdd16639 100644
--- a/qutebrowser/javascript/.eslintrc.yaml
+++ b/qutebrowser/javascript/.eslintrc.yaml
@@ -1,3 +1,15 @@
+# qutebrowser's way of using eslint is perhaps a bit untypical: We turn on *all*
+# the checks eslint has to offer, and then selectively disable/reconfigure the
+# ones which got in the way below.
+#
+# This makes eslint much stricter (which is good). However, it means you might
+# run into a case where you totally disagree with what it says, because some
+# check is not useful or desired for qutebrowser, but nobody did run into it
+# yet.
+#
+# In those cases, it's absolutely okay to modify this config as part of your PR.
+# See it as a way to fine-tune eslint rather than a rigid style guide.
+
 env:
     browser: true
 

From 3775bf929fec0422756b5f8073dd997d16868645 Mon Sep 17 00:00:00 2001
From: Thomas Broadley <buriedunderbooks@hotmail.com>
Date: Sat, 16 Dec 2017 11:24:14 -0500
Subject: [PATCH 230/322] Fix typos

---
 misc/requirements/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/README.md b/misc/requirements/README.md
index f38c4443e..6ae986279 100644
--- a/misc/requirements/README.md
+++ b/misc/requirements/README.md
@@ -1,5 +1,5 @@
 This directory contains various `requirements` files which are used by `tox` to
-have reproducable tests with pinned versions.
+have reproducible tests with pinned versions.
 
 The files are generated based on unpinned requirements in `*.txt-raw` files.
 

From 31c29886932fb007fb704aa9183e8d75f7cfe5b9 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sun, 17 Dec 2017 13:28:00 -0500
Subject: [PATCH 231/322] Fix test_config.test_get for updated config.

colors.completion.fg is now a list instead of a QColor. As this test
specifically wanted to test a QColor, I just changed it to a different
config option.
---
 tests/unit/config/test_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index 32a7a8119..93686e600 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -385,7 +385,7 @@ class TestConfig:
 
     def test_get(self, conf):
         """Test conf.get() with a QColor (where get/get_obj is different)."""
-        assert conf.get('colors.completion.fg') == QColor('white')
+        assert conf.get('colors.completion.category.fg') == QColor('white')
 
     @pytest.mark.parametrize('value', [{}, {'normal': {'a': 'nop'}}])
     def test_get_bindings(self, config_stub, conf, value):

From ef2de8201a7f06c2f5ca8079af40beeb1fa8951f Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Mon, 18 Dec 2017 07:58:26 -0500
Subject: [PATCH 232/322] Fix colors.completion.fg default and description.

Update the description to mention the number of columns and change the
default to ["white", "white", "white"] to make it more obvious that
multiple colors can be specified. This also satisfies the config test
that expects the default value for ListOrValue types to be a list.

One other test had to be tweaked to use a config option that is still
just a QtColor rather than a ListOrValue.

While it is possible to provide just two colors, it is "undefined
behavior". It will use the first color as the third color, but that is
an artifact of the implementation and therefore not documented (though
also not an error, as it is harmless).
---
 qutebrowser/config/configdata.yml | 6 +++---
 tests/unit/config/test_config.py  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 6d8812c25..aca0311fd 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1540,15 +1540,15 @@ zoom.text_only:
 ## colors
 
 colors.completion.fg:
-  default: white
+  default: ["white", "white", "white"]
   type:
     name: ListOrValue
     valtype: QtColor
   desc: >-
     Text color of the completion widget.
 
-    May be a single value to specify the color for all columns, or a list
-    specifying a different color for each column.
+    May be a single color to use for all columns or a list of three colors,
+    one for each column.
 
 colors.completion.odd.bg:
   default: '#444444'
diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index 93686e600..d8bf73700 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -400,7 +400,7 @@ class TestConfig:
         assert not conf._mutables
 
     def test_get_obj_simple(self, conf):
-        assert conf.get_obj('colors.completion.fg') == 'white'
+        assert conf.get_obj('colors.completion.category.fg') == 'white'
 
     @pytest.mark.parametrize('option', ['content.headers.custom',
                                         'keyhint.blacklist',

From dbb89b1073db8a7a7da6b0e7cb5fae504580febf Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 18 Dec 2017 16:11:29 +0100
Subject: [PATCH 233/322] Update docs

---
 doc/changelog.asciidoc     | 2 ++
 doc/help/settings.asciidoc | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 2fb8af4d7..f7bd8ae2c 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -61,6 +61,8 @@ Added
 - Support for incremental search, with a new `search.incremental` setting.
 - New `--rapid` flag for `:command-accept` (bound to `Ctrl-Enter` by default),
   which allows executing a command in the completion without closing it.
+- The `colors.completion.fg` setting can now be a list, allowing to specify
+  different colors for the three completion columns.
 
 Changed
 ~~~~~~~
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 35c90ba61..53af8399d 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -701,10 +701,15 @@ Default: +pass:[#333333]+
 [[colors.completion.fg]]
 === colors.completion.fg
 Text color of the completion widget.
+May be a single color to use for all columns or a list of three colors, one for each column.
 
-Type: <<types,QtColor>>
+Type: <<types,List of QtColor&#44; or QtColor>>
 
-Default: +pass:[white]+
+Default: 
+
+- +pass:[white]+
+- +pass:[white]+
+- +pass:[white]+
 
 [[colors.completion.item.selected.bg]]
 === colors.completion.item.selected.bg

From 7d3645adc2ae269524a686961587a5cacb33fce2 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 18 Dec 2017 16:23:15 +0100
Subject: [PATCH 234/322] Update flake8-bugbear from 17.4.0 to 17.12.0

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 37ceb7f31..bf7a02389 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -2,7 +2,7 @@
 
 attrs==17.3.0
 flake8==3.5.0
-flake8-bugbear==17.4.0
+flake8-bugbear==17.12.0
 flake8-builtins==1.0.post0
 flake8-comprehensions==1.4.1
 flake8-copyright==0.2.0

From 23e3a5ef7dde43108733804b6f7de5ab34ddfde5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 18 Dec 2017 16:23:16 +0100
Subject: [PATCH 235/322] Update hypothesis from 3.42.1 to 3.44.1

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index bf80acee7..a30c1272c 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -11,7 +11,7 @@ fields==5.0.0
 Flask==0.12.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.42.1
+hypothesis==3.44.1
 itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7

From 12ba64254746fc7dd55925f2f3b79844b719eea4 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 19 Dec 2017 08:29:39 +0100
Subject: [PATCH 236/322] Avoid using pytest.config

It's going to be removed in some future pytest release.
---
 tests/end2end/fixtures/quteprocess.py      | 14 ++++++-------
 tests/end2end/fixtures/test_quteprocess.py | 13 ++++++------
 tests/end2end/fixtures/test_testprocess.py | 16 +++++++--------
 tests/end2end/fixtures/testprocess.py      | 24 ++++++++++++++--------
 tests/end2end/fixtures/webserver.py        | 10 ++++-----
 5 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index 3f5e727e6..8c9acd6ce 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -44,9 +44,9 @@ from end2end.fixtures import testprocess
 instance_counter = itertools.count()
 
 
-def is_ignored_qt_message(message):
+def is_ignored_qt_message(pytestconfig, message):
     """Check if the message is listed in qt_log_ignore."""
-    regexes = pytest.config.getini('qt_log_ignore')
+    regexes = pytestconfig.getini('qt_log_ignore')
     for regex in regexes:
         if re.search(regex, message):
             return True
@@ -207,7 +207,7 @@ class LogLine(testprocess.Line):
         expected: Whether the message was expected or not.
     """
 
-    def __init__(self, data):
+    def __init__(self, pytestconfig, data):
         super().__init__(data)
         try:
             line = json.loads(data)
@@ -229,7 +229,7 @@ class LogLine(testprocess.Line):
         self.traceback = line.get('traceback')
         self.message = line['message']
 
-        self.expected = is_ignored_qt_message(self.message)
+        self.expected = is_ignored_qt_message(pytestconfig, self.message)
         self.use_color = False
 
     def __str__(self):
@@ -299,7 +299,7 @@ class QuteProc(testprocess.Process):
             'message']
 
     def __init__(self, request, *, parent=None):
-        super().__init__(parent)
+        super().__init__(request.config, parent)
         self._ipc_socket = None
         self.basedir = None
         self._focus_ready = False
@@ -372,11 +372,11 @@ class QuteProc(testprocess.Process):
 
     def _parse_line(self, line):
         try:
-            log_line = LogLine(line)
+            log_line = LogLine(self._pytestconfig, line)
         except testprocess.InvalidLine:
             if not line.strip():
                 return None
-            elif (is_ignored_qt_message(line) or
+            elif (is_ignored_qt_message(self._pytestconfig, line) or
                   is_ignored_lowlevel_message(line) or
                   is_ignored_chromium_message(line) or
                   self.request.node.get_marker('no_invalid_lines')):
diff --git a/tests/end2end/fixtures/test_quteprocess.py b/tests/end2end/fixtures/test_quteprocess.py
index f8241397f..528d29948 100644
--- a/tests/end2end/fixtures/test_quteprocess.py
+++ b/tests/end2end/fixtures/test_quteprocess.py
@@ -222,8 +222,8 @@ def test_quteprocess_quitting(qtbot, quteproc_process):
         {'category': 'py.warnings'},
         id='resourcewarning'),
 ])
-def test_log_line_parse(data, attrs):
-    line = quteprocess.LogLine(data)
+def test_log_line_parse(pytestconfig, data, attrs):
+    line = quteprocess.LogLine(pytestconfig, data)
     for name, expected in attrs.items():
         actual = getattr(line, name)
         assert actual == expected, name
@@ -283,9 +283,10 @@ def test_log_line_parse(data, attrs):
         '\033[36mfoo        bar:qux:10\033[0m \033[37mquux\033[0m',
         id='expected error colorized'),
 ])
-def test_log_line_formatted(data, colorized, expect_error, expected):
+def test_log_line_formatted(pytestconfig,
+                            data, colorized, expect_error, expected):
     line = json.dumps(data)
-    record = quteprocess.LogLine(line)
+    record = quteprocess.LogLine(pytestconfig, line)
     record.expected = expect_error
     ts = datetime.datetime.fromtimestamp(data['created']).strftime('%H:%M:%S')
     ts += '.{:03.0f}'.format(data['msecs'])
@@ -293,9 +294,9 @@ def test_log_line_formatted(data, colorized, expect_error, expected):
     assert record.formatted_str(colorized=colorized) == expected
 
 
-def test_log_line_no_match():
+def test_log_line_no_match(pytestconfig):
     with pytest.raises(testprocess.InvalidLine):
-        quteprocess.LogLine("Hello World!")
+        quteprocess.LogLine(pytestconfig, "Hello World!")
 
 
 class TestClickElementByText:
diff --git a/tests/end2end/fixtures/test_testprocess.py b/tests/end2end/fixtures/test_testprocess.py
index 1811b7fb1..733191415 100644
--- a/tests/end2end/fixtures/test_testprocess.py
+++ b/tests/end2end/fixtures/test_testprocess.py
@@ -51,8 +51,8 @@ class PythonProcess(testprocess.Process):
 
     """A testprocess which runs the given Python code."""
 
-    def __init__(self):
-        super().__init__()
+    def __init__(self, pytestconfig):
+        super().__init__(pytestconfig)
         self.proc.setReadChannel(QProcess.StandardOutput)
         self.code = None
 
@@ -103,22 +103,22 @@ class NoReadyPythonProcess(PythonProcess):
 
 
 @pytest.fixture
-def pyproc():
-    proc = PythonProcess()
+def pyproc(pytestconfig):
+    proc = PythonProcess(pytestconfig)
     yield proc
     proc.terminate()
 
 
 @pytest.fixture
-def quit_pyproc():
-    proc = QuitPythonProcess()
+def quit_pyproc(pytestconfig):
+    proc = QuitPythonProcess(pytestconfig)
     yield proc
     proc.terminate()
 
 
 @pytest.fixture
-def noready_pyproc():
-    proc = NoReadyPythonProcess()
+def noready_pyproc(pytestconfig):
+    proc = NoReadyPythonProcess(pytestconfig)
     yield proc
     proc.terminate()
 
diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index ac220af58..e504bcc1b 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -73,12 +73,11 @@ class Line:
     waited_for = attr.ib(False)
 
 
-def _render_log(data, threshold=100):
+def _render_log(data, *, verbose, threshold=100):
     """Shorten the given log without -v and convert to a string."""
     data = [str(d) for d in data]
     is_exception = any('Traceback (most recent call last):' in line or
                        'Uncaught exception' in line for line in data)
-    verbose = pytest.config.getoption('--verbose')
     if len(data) > threshold and not verbose and not is_exception:
         msg = '[{} lines suppressed, use -v to show]'.format(
             len(data) - threshold)
@@ -105,15 +104,17 @@ def pytest_runtest_makereport(item, call):
         # is actually a tuple. This is handled similarily in pytest-qt too.
         return
 
-    if pytest.config.getoption('--capture') == 'no':
+    if item.config.getoption('--capture') == 'no':
         # Already printed live
         return
 
+    verbose = item.config.getoption('--verbose')
     if quteproc_log is not None:
         report.longrepr.addsection("qutebrowser output",
-                                   _render_log(quteproc_log))
+                                   _render_log(quteproc_log, verbose=verbose))
     if server_log is not None:
-        report.longrepr.addsection("server output", _render_log(server_log))
+        report.longrepr.addsection("server output",
+                                   _render_log(server_log, verbose=verbose))
 
 
 class Process(QObject):
@@ -128,6 +129,7 @@ class Process(QObject):
         _started: Whether the process was ever started.
         proc: The QProcess for the underlying process.
         exit_expected: Whether the process is expected to quit.
+        pytestconfig: The pytestconfig fixture.
 
     Signals:
         ready: Emitted when the server finished starting up.
@@ -138,8 +140,9 @@ class Process(QObject):
     new_data = pyqtSignal(object)
     KEYS = ['data']
 
-    def __init__(self, parent=None):
+    def __init__(self, pytestconfig, parent=None):
         super().__init__(parent)
+        self._pytestconfig = pytestconfig
         self.captured_log = []
         self._started = False
         self._invalid = []
@@ -150,7 +153,7 @@ class Process(QObject):
 
     def _log(self, line):
         """Add the given line to the captured log output."""
-        if pytest.config.getoption('--capture') == 'no':
+        if self._pytestconfig.getoption('--capture') == 'no':
             print(line)
         self.captured_log.append(line)
 
@@ -225,6 +228,8 @@ class Process(QObject):
         """Start the process and wait until it started."""
         self._start(args, env=env)
         self._started = True
+        verbose = self._pytestconfig.getoption('--verbose')
+
         timeout = 60 if 'CI' in os.environ else 20
         for _ in range(timeout):
             with self._wait_signal(self.ready, timeout=1000,
@@ -236,14 +241,15 @@ class Process(QObject):
                     return
                 # _start ensures it actually started, but it might quit shortly
                 # afterwards
-                raise ProcessExited('\n' + _render_log(self.captured_log))
+                raise ProcessExited('\n' + _render_log(self.captured_log,
+                                                       verbose=verbose))
 
             if blocker.signal_triggered:
                 self._after_start()
                 return
 
         raise WaitForTimeout("Timed out while waiting for process start.\n" +
-                             _render_log(self.captured_log))
+                             _render_log(self.captured_log, verbose=verbose))
 
     def _start(self, args, env):
         """Actually start the process."""
diff --git a/tests/end2end/fixtures/webserver.py b/tests/end2end/fixtures/webserver.py
index a40c62015..b86a55b35 100644
--- a/tests/end2end/fixtures/webserver.py
+++ b/tests/end2end/fixtures/webserver.py
@@ -137,8 +137,8 @@ class WebserverProcess(testprocess.Process):
 
     KEYS = ['verb', 'path']
 
-    def __init__(self, script, parent=None):
-        super().__init__(parent)
+    def __init__(self, pytestconfig, script, parent=None):
+        super().__init__(pytestconfig, parent)
         self._script = script
         self.port = utils.random_port()
         self.new_data.connect(self.new_request)
@@ -174,9 +174,9 @@ class WebserverProcess(testprocess.Process):
 
 
 @pytest.fixture(scope='session', autouse=True)
-def server(qapp):
+def server(qapp, pytestconfig):
     """Fixture for an server object which ensures clean setup/teardown."""
-    server = WebserverProcess('webserver_sub')
+    server = WebserverProcess(pytestconfig, 'webserver_sub')
     server.start()
     yield server
     server.terminate()
@@ -198,7 +198,7 @@ def ssl_server(request, qapp):
     This needs to be explicitly used in a test, and overwrites the server log
     used in that test.
     """
-    server = WebserverProcess('webserver_sub_ssl')
+    server = WebserverProcess(request.config, 'webserver_sub_ssl')
     request.node._server_log = server.captured_log
     server.start()
     yield server

From f2c93a00611abfe4b94a63293d8dc35099d27554 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 19 Dec 2017 08:35:00 +0100
Subject: [PATCH 237/322] Use request instead of pytestconfig

This unifies QuteProc and the other Process subclasses a bit.
---
 tests/end2end/fixtures/quteprocess.py      |  7 +++----
 tests/end2end/fixtures/test_quteprocess.py |  7 +++++++
 tests/end2end/fixtures/test_testprocess.py | 20 ++++++++++----------
 tests/end2end/fixtures/testprocess.py      | 10 +++++-----
 tests/end2end/fixtures/webserver.py        | 10 +++++-----
 5 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index 8c9acd6ce..a2947e5af 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -299,14 +299,13 @@ class QuteProc(testprocess.Process):
             'message']
 
     def __init__(self, request, *, parent=None):
-        super().__init__(request.config, parent)
+        super().__init__(request, parent)
         self._ipc_socket = None
         self.basedir = None
         self._focus_ready = False
         self._load_ready = False
         self._instance_id = next(instance_counter)
         self._run_counter = itertools.count()
-        self.request = request
 
     def _is_ready(self, what):
         """Called by _parse_line if loading/focusing is done.
@@ -372,11 +371,11 @@ class QuteProc(testprocess.Process):
 
     def _parse_line(self, line):
         try:
-            log_line = LogLine(self._pytestconfig, line)
+            log_line = LogLine(self.request.config, line)
         except testprocess.InvalidLine:
             if not line.strip():
                 return None
-            elif (is_ignored_qt_message(self._pytestconfig, line) or
+            elif (is_ignored_qt_message(self.request.config, line) or
                   is_ignored_lowlevel_message(line) or
                   is_ignored_chromium_message(line) or
                   self.request.node.get_marker('no_invalid_lines')):
diff --git a/tests/end2end/fixtures/test_quteprocess.py b/tests/end2end/fixtures/test_quteprocess.py
index 528d29948..aa3fb5857 100644
--- a/tests/end2end/fixtures/test_quteprocess.py
+++ b/tests/end2end/fixtures/test_quteprocess.py
@@ -45,6 +45,10 @@ class FakeConfig:
         '--qute-delay': 0,
         '--color': True,
         '--verbose': False,
+        '--capture': None,
+    }
+    INI = {
+        'qt_log_ignore': [],
     }
 
     def __init__(self):
@@ -53,6 +57,9 @@ class FakeConfig:
     def getoption(self, name):
         return self.ARGS[name]
 
+    def getini(self, name):
+        return self.INI[name]
+
 
 class FakeNode:
 
diff --git a/tests/end2end/fixtures/test_testprocess.py b/tests/end2end/fixtures/test_testprocess.py
index 733191415..6ceb032af 100644
--- a/tests/end2end/fixtures/test_testprocess.py
+++ b/tests/end2end/fixtures/test_testprocess.py
@@ -51,8 +51,8 @@ class PythonProcess(testprocess.Process):
 
     """A testprocess which runs the given Python code."""
 
-    def __init__(self, pytestconfig):
-        super().__init__(pytestconfig)
+    def __init__(self, request):
+        super().__init__(request)
         self.proc.setReadChannel(QProcess.StandardOutput)
         self.code = None
 
@@ -103,22 +103,22 @@ class NoReadyPythonProcess(PythonProcess):
 
 
 @pytest.fixture
-def pyproc(pytestconfig):
-    proc = PythonProcess(pytestconfig)
+def pyproc(request):
+    proc = PythonProcess(request)
     yield proc
     proc.terminate()
 
 
 @pytest.fixture
-def quit_pyproc(pytestconfig):
-    proc = QuitPythonProcess(pytestconfig)
+def quit_pyproc(request):
+    proc = QuitPythonProcess(request)
     yield proc
     proc.terminate()
 
 
 @pytest.fixture
-def noready_pyproc(pytestconfig):
-    proc = NoReadyPythonProcess(pytestconfig)
+def noready_pyproc(request):
+    proc = NoReadyPythonProcess(request)
     yield proc
     proc.terminate()
 
@@ -149,9 +149,9 @@ def test_process_never_started(qtbot, quit_pyproc):
     quit_pyproc.after_test()
 
 
-def test_wait_signal_raising(qtbot):
+def test_wait_signal_raising(request, qtbot):
     """testprocess._wait_signal should raise by default."""
-    proc = testprocess.Process()
+    proc = testprocess.Process(request)
     with pytest.raises(qtbot.TimeoutError):
         with proc._wait_signal(proc.proc.started, timeout=0):
             pass
diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index e504bcc1b..3fb259e47 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -129,7 +129,7 @@ class Process(QObject):
         _started: Whether the process was ever started.
         proc: The QProcess for the underlying process.
         exit_expected: Whether the process is expected to quit.
-        pytestconfig: The pytestconfig fixture.
+        request: The request object for the current test.
 
     Signals:
         ready: Emitted when the server finished starting up.
@@ -140,9 +140,9 @@ class Process(QObject):
     new_data = pyqtSignal(object)
     KEYS = ['data']
 
-    def __init__(self, pytestconfig, parent=None):
+    def __init__(self, request, parent=None):
         super().__init__(parent)
-        self._pytestconfig = pytestconfig
+        self.request = request
         self.captured_log = []
         self._started = False
         self._invalid = []
@@ -153,7 +153,7 @@ class Process(QObject):
 
     def _log(self, line):
         """Add the given line to the captured log output."""
-        if self._pytestconfig.getoption('--capture') == 'no':
+        if self.request.config.getoption('--capture') == 'no':
             print(line)
         self.captured_log.append(line)
 
@@ -228,7 +228,7 @@ class Process(QObject):
         """Start the process and wait until it started."""
         self._start(args, env=env)
         self._started = True
-        verbose = self._pytestconfig.getoption('--verbose')
+        verbose = self.request.config.getoption('--verbose')
 
         timeout = 60 if 'CI' in os.environ else 20
         for _ in range(timeout):
diff --git a/tests/end2end/fixtures/webserver.py b/tests/end2end/fixtures/webserver.py
index b86a55b35..93ef04f03 100644
--- a/tests/end2end/fixtures/webserver.py
+++ b/tests/end2end/fixtures/webserver.py
@@ -137,8 +137,8 @@ class WebserverProcess(testprocess.Process):
 
     KEYS = ['verb', 'path']
 
-    def __init__(self, pytestconfig, script, parent=None):
-        super().__init__(pytestconfig, parent)
+    def __init__(self, request, script, parent=None):
+        super().__init__(request, parent)
         self._script = script
         self.port = utils.random_port()
         self.new_data.connect(self.new_request)
@@ -174,9 +174,9 @@ class WebserverProcess(testprocess.Process):
 
 
 @pytest.fixture(scope='session', autouse=True)
-def server(qapp, pytestconfig):
+def server(qapp, request):
     """Fixture for an server object which ensures clean setup/teardown."""
-    server = WebserverProcess(pytestconfig, 'webserver_sub')
+    server = WebserverProcess(request, 'webserver_sub')
     server.start()
     yield server
     server.terminate()
@@ -198,7 +198,7 @@ def ssl_server(request, qapp):
     This needs to be explicitly used in a test, and overwrites the server log
     used in that test.
     """
-    server = WebserverProcess(request.config, 'webserver_sub_ssl')
+    server = WebserverProcess(request, 'webserver_sub_ssl')
     request.node._server_log = server.captured_log
     server.start()
     yield server

From 4ffdd9da0e03d27538d0c1fb5709486c64b4b508 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 19 Dec 2017 08:57:33 +0100
Subject: [PATCH 238/322] Add new B008 to flake8 ignores

---
 .flake8 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.flake8 b/.flake8
index 06883f526..340132d49 100644
--- a/.flake8
+++ b/.flake8
@@ -1,6 +1,7 @@
 [flake8]
 exclude = .*,__pycache__,resources.py
 # B001: bare except
+# B008: Do not perform calls in argument defaults. (fine with some Qt stuff)
 # B305: .next() (false-positives)
 # E128: continuation line under-indented for visual indent
 # E226: missing whitespace around arithmetic operator
@@ -33,7 +34,7 @@ exclude = .*,__pycache__,resources.py
 # D413: Missing blank line after last section (not in pep257?)
 # A003: Builtin name for class attribute (needed for attrs)
 ignore =
-    B001,B305,
+    B001,B008,B305,
     E128,E226,E265,E501,E402,E266,E722,E731,
     F401,
     N802,

From 3c0d51c253dfd5e95cf40cbfeaa171bfa7aa4365 Mon Sep 17 00:00:00 2001
From: Cody Scott <cody.j.b.scott@gmail.com>
Date: Tue, 19 Dec 2017 12:18:10 -0500
Subject: [PATCH 239/322] Fix broken link

---
 doc/faq.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/faq.asciidoc b/doc/faq.asciidoc
index 7794c9d13..0d94796a4 100644
--- a/doc/faq.asciidoc
+++ b/doc/faq.asciidoc
@@ -221,5 +221,5 @@ My issue is not listed.::
     https://github.com/qutebrowser/qutebrowser/issues[the issue tracker] or
     using the `:report` command.
     If you are reporting a segfault, make sure you read the
-    link:doc/stacktrace.asciidoc[guide] on how to report them with all needed
+    link:stacktrace.asciidoc[guide] on how to report them with all needed
     information.

From c8ae405bfe7dd3a0b583013ed1b894c71186e4c7 Mon Sep 17 00:00:00 2001
From: seebye <seebye@users.noreply.github.com>
Date: Wed, 20 Dec 2017 00:10:21 +0100
Subject: [PATCH 240/322] fix #3396

---
 qutebrowser/browser/history.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index ecab730ae..e82e6970d 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -171,7 +171,9 @@ class WebHistory(sql.SqlTable):
     @pyqtSlot(QUrl, QUrl, str)
     def add_from_tab(self, url, requested_url, title):
         """Add a new history entry as slot, called from a BrowserTab."""
-        if url.scheme() == 'data' or requested_url.scheme() == 'data':
+        if any(url.scheme() == 'data' or
+               ('qute', 'back') == (url.scheme(), url.host())
+                for url in (url, requested_url)):
             return
         if url.isEmpty():
             # things set via setHtml

From 801b6b90ce43b78d0a202f018833621b486cc7f7 Mon Sep 17 00:00:00 2001
From: seebye <seebye@users.noreply.github.com>
Date: Wed, 20 Dec 2017 01:15:12 +0100
Subject: [PATCH 241/322] pylint adjustments

---
 qutebrowser/browser/history.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index e82e6970d..e800ac0b2 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -173,7 +173,7 @@ class WebHistory(sql.SqlTable):
         """Add a new history entry as slot, called from a BrowserTab."""
         if any(url.scheme() == 'data' or
                ('qute', 'back') == (url.scheme(), url.host())
-                for url in (url, requested_url)):
+               for url in (url, requested_url)):
             return
         if url.isEmpty():
             # things set via setHtml

From 5c00eea122eaf4c645c2eec3b3e01b9ee18c02e0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 20 Dec 2017 11:35:27 +0100
Subject: [PATCH 242/322] Fix stripping of lines in asciidoc2html

This broke in #3382 since re.fullmatch does a different thing for trailing
newlines:

    >>> line
    '===========\n'
    >>> re.match(r'^=+$', line)
    <_sre.SRE_Match object; span=(0, 11), match='==========='>
    >>> re.fullmatch(r'=+', line)
    >>>

This now strips the line by default, and adds newlines if needed.
---
 scripts/asciidoc2html.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/asciidoc2html.py b/scripts/asciidoc2html.py
index dce1f27bd..01af53693 100755
--- a/scripts/asciidoc2html.py
+++ b/scripts/asciidoc2html.py
@@ -147,13 +147,14 @@ class AsciiDoc:
             last_line = ""
 
             for line in infp:
-                if line.strip() == '// QUTE_WEB_HIDE':
+                line = line.rstrip()
+                if line == '// QUTE_WEB_HIDE':
                     assert not hidden
                     hidden = True
-                elif line.strip() == '// QUTE_WEB_HIDE_END':
+                elif line == '// QUTE_WEB_HIDE_END':
                     assert hidden
                     hidden = False
-                elif line == "The Compiler <mail@qutebrowser.org>\n":
+                elif line == "The Compiler <mail@qutebrowser.org>":
                     continue
                 elif re.fullmatch(r':\w+:.*', line):
                     # asciidoc field
@@ -163,16 +164,16 @@ class AsciiDoc:
                     if re.fullmatch(r'=+', line):
                         line = line.replace('=', '-')
                         found_title = True
-                        title = last_line.rstrip('\n') + " | qutebrowser\n"
+                        title = last_line + " | qutebrowser\n"
                         title += "=" * (len(title) - 1)
                     elif re.fullmatch(r'= .+', line):
                         line = '==' + line[1:]
                         found_title = True
-                        title = last_line.rstrip('\n') + " | qutebrowser\n"
+                        title = last_line + " | qutebrowser\n"
                         title += "=" * (len(title) - 1)
 
                 if not hidden:
-                    outfp.write(line.replace(".asciidoc[", ".html["))
+                    outfp.write(line.replace(".asciidoc[", ".html[") + '\n')
                     last_line = line
 
         current_lines = outfp.getvalue()

From 5bfab5482839a25f4b2761134617c75caf32bb5c Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Wed, 20 Dec 2017 18:05:11 -0600
Subject: [PATCH 243/322] supplement broken webengine load signals

This uses the much more reliable `loadProgress(100)` in place of
`loadFinished(true)` for WebEngine, with `loadProgressFake` and
`loadFinishedFake` used instead of the 'official' variants.
---
 qutebrowser/browser/webengine/webenginetab.py | 47 ++++++++++++++++---
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 813f1eb9c..10c826bd9 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -24,7 +24,7 @@ import functools
 import html as html_utils
 
 import sip
-from PyQt5.QtCore import pyqtSlot, Qt, QEvent, QPoint, QPointF, QUrl, QTimer
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QEvent, QPoint, QPointF, QUrl, QTimer
 from PyQt5.QtGui import QKeyEvent
 from PyQt5.QtNetwork import QAuthenticator
 from PyQt5.QtWidgets import QApplication
@@ -539,7 +539,18 @@ class WebEngineElements(browsertab.AbstractElements):
 
 class WebEngineTab(browsertab.AbstractTab):
 
-    """A QtWebEngine tab in the browser."""
+    """A QtWebEngine tab in the browser.
+
+    Signals:
+        loadFinishedFake:
+            Used in place of unreliable loadFinished
+        loadProgressFake:
+            Used in place of loadProgress
+    """
+
+    #WORKAROUND for https://bugreports.qt.io/browse/QTBUG-65223
+    loadFinishedFake = pyqtSignal(bool)
+    loadProgressFake = pyqtSignal(int)
 
     def __init__(self, *, win_id, mode_manager, private, parent=None):
         super().__init__(win_id=win_id, mode_manager=mode_manager,
@@ -793,17 +804,31 @@ class WebEngineTab(browsertab.AbstractTab):
         }
         self.renderer_process_terminated.emit(status_map[status], exitcode)
 
+    @pyqtSlot(int)
+    def _on_load_progress_fake(self, perc):
+        """Use loadProgress(100) to emit loadFinished(True).
+
+        See https://bugreports.qt.io/browse/QTBUG-65223
+        """
+        self.loadProgressFake.emit(perc)
+        if perc == 100 and self.load_status() != usertypes.LoadStatus.error:
+            self.loadFinishedFake.emit(True)
+
+    @pyqtSlot(bool)
+    def _on_load_finished_fake(self, ok):
+        """Use only loadFinished(False).
+
+        See https://bugreports.qt.io/browse/QTBUG-65223
+        """
+        if not ok:
+            self.loadFinishedFake.emit(False)
+
     def _connect_signals(self):
         view = self._widget
         page = view.page()
 
         page.windowCloseRequested.connect(self.window_close_requested)
         page.linkHovered.connect(self.link_hovered)
-        page.loadProgress.connect(self._on_load_progress)
-        page.loadStarted.connect(self._on_load_started)
-        page.loadFinished.connect(self._on_history_trigger)
-        page.loadFinished.connect(self._restore_zoom)
-        page.loadFinished.connect(self._on_load_finished)
         page.certificate_error.connect(self._on_ssl_errors)
         page.authenticationRequired.connect(self._on_authentication_required)
         page.proxyAuthenticationRequired.connect(
@@ -816,6 +841,14 @@ class WebEngineTab(browsertab.AbstractTab):
         view.renderProcessTerminated.connect(
             self._on_render_process_terminated)
         view.iconChanged.connect(self.icon_changed)
+        #WORKAROUND for https://bugreports.qt.io/browse/QTBUG-65223
+        page.loadProgress.connect(self._on_load_progress_fake)
+        self.loadProgressFake.connect(self._on_load_progress)
+        page.loadStarted.connect(self._on_load_started)
+        self.loadFinishedFake.connect(self._on_history_trigger)
+        self.loadFinishedFake.connect(self._restore_zoom)
+        self.loadFinishedFake.connect(self._on_load_finished)
+        page.loadFinished.connect(self._on_load_finished_fake)
 
     def event_target(self):
         return self._widget.focusProxy()

From d6c56b83a83d5616109b17b581372782bd50f35e Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Thu, 21 Dec 2017 16:31:45 -0600
Subject: [PATCH 244/322] fix line length

---
 qutebrowser/browser/webengine/webenginetab.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 10c826bd9..0003dc1e6 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -24,7 +24,8 @@ import functools
 import html as html_utils
 
 import sip
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QEvent, QPoint, QPointF, QUrl, QTimer
+from PyQt5.QtCore import (pyqtSignal, pyqtSlot, Qt, QEvent, QPoint, QPointF,
+                          QUrl, QTimer)
 from PyQt5.QtGui import QKeyEvent
 from PyQt5.QtNetwork import QAuthenticator
 from PyQt5.QtWidgets import QApplication

From 4a6c9ecc343ce86cf38a5189d7cab3e0fb6aa16b Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Thu, 21 Dec 2017 21:22:20 -0600
Subject: [PATCH 245/322] only reroute load signals with Qt=5.10

This stops regressions on Qt<=5.9. It also reintroduces #3110, but
fixing #3110 was just a nice side effect rather than the main goal here.
---
 qutebrowser/browser/webengine/webenginetab.py | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 0003dc1e6..e4b1c7d39 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -25,7 +25,7 @@ import html as html_utils
 
 import sip
 from PyQt5.QtCore import (pyqtSignal, pyqtSlot, Qt, QEvent, QPoint, QPointF,
-                          QUrl, QTimer)
+                          QUrl, QTimer, QT_VERSION_STR)
 from PyQt5.QtGui import QKeyEvent
 from PyQt5.QtNetwork import QAuthenticator
 from PyQt5.QtWidgets import QApplication
@@ -830,6 +830,7 @@ class WebEngineTab(browsertab.AbstractTab):
 
         page.windowCloseRequested.connect(self.window_close_requested)
         page.linkHovered.connect(self.link_hovered)
+        page.loadStarted.connect(self._on_load_started)
         page.certificate_error.connect(self._on_ssl_errors)
         page.authenticationRequired.connect(self._on_authentication_required)
         page.proxyAuthenticationRequired.connect(
@@ -843,13 +844,20 @@ class WebEngineTab(browsertab.AbstractTab):
             self._on_render_process_terminated)
         view.iconChanged.connect(self.icon_changed)
         #WORKAROUND for https://bugreports.qt.io/browse/QTBUG-65223
-        page.loadProgress.connect(self._on_load_progress_fake)
-        self.loadProgressFake.connect(self._on_load_progress)
-        page.loadStarted.connect(self._on_load_started)
-        self.loadFinishedFake.connect(self._on_history_trigger)
-        self.loadFinishedFake.connect(self._restore_zoom)
-        self.loadFinishedFake.connect(self._on_load_finished)
-        page.loadFinished.connect(self._on_load_finished_fake)
+        if QT_VERSION_STR.startswith('5.10'):
+            page.loadProgress.connect(self._on_load_progress_fake)
+            self.loadProgressFake.connect(self._on_load_progress)
+            self.loadFinishedFake.connect(self._on_history_trigger)
+            self.loadFinishedFake.connect(self._restore_zoom)
+            self.loadFinishedFake.connect(self._on_load_finished)
+            page.loadFinished.connect(self._on_load_finished_fake)
+        else:
+            #for older Qt versions which break with the above
+            page.loadProgress.connect(self._on_load_progress)
+            page.loadStarted.connect(self._on_load_started)
+            page.loadFinished.connect(self._on_history_trigger)
+            page.loadFinished.connect(self._restore_zoom)
+            page.loadFinished.connect(self._on_load_finished)
 
     def event_target(self):
         return self._widget.focusProxy()

From fa10b76ce869be4e6f97af040405b727ae131033 Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Fri, 22 Dec 2017 01:27:35 -0600
Subject: [PATCH 246/322] remove extraneous loadStarted connection

Copying and pasting without thinking might lead to redundancy.
---
 qutebrowser/browser/webengine/webenginetab.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index e4b1c7d39..7500520b3 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -854,7 +854,6 @@ class WebEngineTab(browsertab.AbstractTab):
         else:
             #for older Qt versions which break with the above
             page.loadProgress.connect(self._on_load_progress)
-            page.loadStarted.connect(self._on_load_started)
             page.loadFinished.connect(self._on_history_trigger)
             page.loadFinished.connect(self._restore_zoom)
             page.loadFinished.connect(self._on_load_finished)

From 125af531cb8519916a29ff79733dd4fb5a660826 Mon Sep 17 00:00:00 2001
From: seebye <seebye@users.noreply.github.com>
Date: Fri, 22 Dec 2017 15:44:42 +0100
Subject: [PATCH 247/322] database qute://back

---
 qutebrowser/browser/history.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index e800ac0b2..04bc1be15 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -32,7 +32,7 @@ from qutebrowser.misc import objects, sql
 
 
 # increment to indicate that HistoryCompletion must be regenerated
-_USER_VERSION = 1
+_USER_VERSION = 2
 
 
 class CompletionHistory(sql.SqlTable):
@@ -102,7 +102,8 @@ class WebHistory(sql.SqlTable):
         data = {'url': [], 'title': [], 'last_atime': []}
         # select the latest entry for each url
         q = sql.Query('SELECT url, title, max(atime) AS atime FROM History '
-                      'WHERE NOT redirect GROUP BY url ORDER BY atime asc')
+                      'WHERE NOT redirect and url NOT LIKE "qute://back%" '
+                      'GROUP BY url ORDER BY atime asc')
         for entry in q.run():
             data['url'].append(self._format_completion_url(QUrl(entry.url)))
             data['title'].append(entry.title)
@@ -172,7 +173,7 @@ class WebHistory(sql.SqlTable):
     def add_from_tab(self, url, requested_url, title):
         """Add a new history entry as slot, called from a BrowserTab."""
         if any(url.scheme() == 'data' or
-               ('qute', 'back') == (url.scheme(), url.host())
+               (url.scheme(), url.host()) == ('qute', 'back')
                for url in (url, requested_url)):
             return
         if url.isEmpty():

From feb327e80e58e6938dae9600722e5128d0ec2b4d Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Fri, 22 Dec 2017 11:32:31 -0600
Subject: [PATCH 248/322] fix style issues, better names, less indirection

Added spaces to comments, use python naming conventions, remove
_load_progress_fake as unnecessary, rename _on_load_*_fake to
_on_load_*_workaround (for less confusion), and use qtutils rather than
QT_VERSION_STR
---
 qutebrowser/browser/webengine/webenginetab.py | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 7500520b3..172cb3eee 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -25,7 +25,7 @@ import html as html_utils
 
 import sip
 from PyQt5.QtCore import (pyqtSignal, pyqtSlot, Qt, QEvent, QPoint, QPointF,
-                          QUrl, QTimer, QT_VERSION_STR)
+                          QUrl, QTimer)
 from PyQt5.QtGui import QKeyEvent
 from PyQt5.QtNetwork import QAuthenticator
 from PyQt5.QtWidgets import QApplication
@@ -543,15 +543,11 @@ class WebEngineTab(browsertab.AbstractTab):
     """A QtWebEngine tab in the browser.
 
     Signals:
-        loadFinishedFake:
+        _load_finished_fake:
             Used in place of unreliable loadFinished
-        loadProgressFake:
-            Used in place of loadProgress
     """
-
-    #WORKAROUND for https://bugreports.qt.io/browse/QTBUG-65223
-    loadFinishedFake = pyqtSignal(bool)
-    loadProgressFake = pyqtSignal(int)
+    # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-65223
+    _load_finished_fake = pyqtSignal(bool)
 
     def __init__(self, *, win_id, mode_manager, private, parent=None):
         super().__init__(win_id=win_id, mode_manager=mode_manager,
@@ -806,23 +802,22 @@ class WebEngineTab(browsertab.AbstractTab):
         self.renderer_process_terminated.emit(status_map[status], exitcode)
 
     @pyqtSlot(int)
-    def _on_load_progress_fake(self, perc):
+    def _on_load_progress_workaround(self, perc):
         """Use loadProgress(100) to emit loadFinished(True).
 
         See https://bugreports.qt.io/browse/QTBUG-65223
         """
-        self.loadProgressFake.emit(perc)
         if perc == 100 and self.load_status() != usertypes.LoadStatus.error:
-            self.loadFinishedFake.emit(True)
+            self._load_finished_fake.emit(True)
 
     @pyqtSlot(bool)
-    def _on_load_finished_fake(self, ok):
+    def _on_load_finished_workaround(self, ok):
         """Use only loadFinished(False).
 
         See https://bugreports.qt.io/browse/QTBUG-65223
         """
         if not ok:
-            self.loadFinishedFake.emit(False)
+            self._load_finished_fake.emit(False)
 
     def _connect_signals(self):
         view = self._widget
@@ -830,6 +825,7 @@ class WebEngineTab(browsertab.AbstractTab):
 
         page.windowCloseRequested.connect(self.window_close_requested)
         page.linkHovered.connect(self.link_hovered)
+        page.loadProgress.connect(self._on_load_progress)
         page.loadStarted.connect(self._on_load_started)
         page.certificate_error.connect(self._on_ssl_errors)
         page.authenticationRequired.connect(self._on_authentication_required)
@@ -843,20 +839,19 @@ class WebEngineTab(browsertab.AbstractTab):
         view.renderProcessTerminated.connect(
             self._on_render_process_terminated)
         view.iconChanged.connect(self.icon_changed)
-        #WORKAROUND for https://bugreports.qt.io/browse/QTBUG-65223
-        if QT_VERSION_STR.startswith('5.10'):
-            page.loadProgress.connect(self._on_load_progress_fake)
-            self.loadProgressFake.connect(self._on_load_progress)
-            self.loadFinishedFake.connect(self._on_history_trigger)
-            self.loadFinishedFake.connect(self._restore_zoom)
-            self.loadFinishedFake.connect(self._on_load_finished)
-            page.loadFinished.connect(self._on_load_finished_fake)
+        # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-65223
+        if qtutils.version_check('5.10',compiled=False):
+            page.loadProgress.connect(self._on_load_progress_workaround)
+            self._load_progress_fake.connect(self._on_load_progress)
+            self._load_finished_fake.connect(self._on_history_trigger)
+            self._load_finished_fake.connect(self._restore_zoom)
+            self._load_finished_fake.connect(self._on_load_finished)
+            page.loadFinished.connect(self._on_load_finished_workaround)
         else:
-            #for older Qt versions which break with the above
+            # for older Qt versions which break with the above
             page.loadProgress.connect(self._on_load_progress)
             page.loadFinished.connect(self._on_history_trigger)
             page.loadFinished.connect(self._restore_zoom)
-            page.loadFinished.connect(self._on_load_finished)
 
     def event_target(self):
         return self._widget.focusProxy()

From f90342741ae1d7bb2ef19263b802b5cbaf92bd6e Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Fri, 22 Dec 2017 11:41:07 -0600
Subject: [PATCH 249/322] comma spacing

---
 qutebrowser/browser/webengine/webenginetab.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 172cb3eee..cb3de4215 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -840,7 +840,7 @@ class WebEngineTab(browsertab.AbstractTab):
             self._on_render_process_terminated)
         view.iconChanged.connect(self.icon_changed)
         # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-65223
-        if qtutils.version_check('5.10',compiled=False):
+        if qtutils.version_check('5.10', compiled=False):
             page.loadProgress.connect(self._on_load_progress_workaround)
             self._load_progress_fake.connect(self._on_load_progress)
             self._load_finished_fake.connect(self._on_history_trigger)

From 252fbf651f9dc4a5a34867545156bfd04a317b64 Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Fri, 22 Dec 2017 11:47:13 -0600
Subject: [PATCH 250/322] add back blank line for D204

---
 qutebrowser/browser/webengine/webenginetab.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index cb3de4215..7c77fb15d 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -546,6 +546,7 @@ class WebEngineTab(browsertab.AbstractTab):
         _load_finished_fake:
             Used in place of unreliable loadFinished
     """
+
     # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-65223
     _load_finished_fake = pyqtSignal(bool)
 

From 611f3621ec5f20f29b5ce2323a2c050ad21b8ae3 Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Fri, 22 Dec 2017 12:36:45 -0600
Subject: [PATCH 251/322] skip test

tests/end2end/features/test_marks_bdd.py::test_jumping_back_after_following_a_link
---
 tests/end2end/features/marks.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/end2end/features/marks.feature b/tests/end2end/features/marks.feature
index 605bd3971..f7da07255 100644
--- a/tests/end2end/features/marks.feature
+++ b/tests/end2end/features/marks.feature
@@ -86,7 +86,7 @@ Feature: Setting positional marks
         And I wait until the scroll position changed to 10/10
         Then the page should be scrolled to 10 10
 
-    @qtwebengine_todo: Does not emit loaded signal for fragments?
+    @qtwebengine_skip: Does not emit loaded signal for fragments?
     Scenario: Jumping back after following a link
         When I hint with args "links normal" and follow s
         And I wait until data/marks.html#bottom is loaded

From 1d0b91475d2704a832d7f22b67fc3b4f53b19e8d Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Fri, 22 Dec 2017 12:45:37 -0600
Subject: [PATCH 252/322] remove broken connection

---
 qutebrowser/browser/webengine/webenginetab.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 7c77fb15d..63aab3ada 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -843,7 +843,6 @@ class WebEngineTab(browsertab.AbstractTab):
         # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-65223
         if qtutils.version_check('5.10', compiled=False):
             page.loadProgress.connect(self._on_load_progress_workaround)
-            self._load_progress_fake.connect(self._on_load_progress)
             self._load_finished_fake.connect(self._on_history_trigger)
             self._load_finished_fake.connect(self._restore_zoom)
             self._load_finished_fake.connect(self._on_load_finished)

From 46f6336e6ea82c841060168cc2d09c490ebdb499 Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Fri, 22 Dec 2017 12:47:38 -0600
Subject: [PATCH 253/322] and add back needed connection

---
 qutebrowser/browser/webengine/webenginetab.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 63aab3ada..9328698bc 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -852,6 +852,7 @@ class WebEngineTab(browsertab.AbstractTab):
             page.loadProgress.connect(self._on_load_progress)
             page.loadFinished.connect(self._on_history_trigger)
             page.loadFinished.connect(self._restore_zoom)
+            page.loadFinished.connect(self._on_load_finished)
 
     def event_target(self):
         return self._widget.focusProxy()

From d9b00acdc665e88d41d96bdba199f5f69c2302d8 Mon Sep 17 00:00:00 2001
From: RyanJenkins <rjenkins@mail.sfsu.edu>
Date: Sat, 23 Dec 2017 23:59:02 -0800
Subject: [PATCH 254/322] Return focus to qutebrowser when external editor
 finishes.

---
 qutebrowser/browser/commands.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 92a841d72..a912842f6 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1639,6 +1639,7 @@ class CommandDispatcher:
         """
         try:
             elem.set_value(text)
+            mainwindow.raise_window(objreg.last_focused_window())
         except webelem.OrphanedError as e:
             message.error('Edited element vanished')
         except webelem.Error as e:

From c5c3684581832134dd1dedaae4259d683a6bc2cf Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 25 Dec 2017 16:26:11 +0100
Subject: [PATCH 255/322] Update setuptools from 38.2.4 to 38.2.5

---
 misc/requirements/requirements-pip.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt
index b7914cac5..42fae6bc9 100644
--- a/misc/requirements/requirements-pip.txt
+++ b/misc/requirements/requirements-pip.txt
@@ -3,6 +3,6 @@
 appdirs==1.4.3
 packaging==16.8
 pyparsing==2.2.0
-setuptools==38.2.4
+setuptools==38.2.5
 six==1.11.0
 wheel==0.30.0

From 0d61c75ce4e5cc2968f3935805c7fc7478b5a0b0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 25 Dec 2017 16:26:13 +0100
Subject: [PATCH 256/322] Update hypothesis from 3.44.1 to 3.44.4

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index a30c1272c..c10c5a2b0 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -11,7 +11,7 @@ fields==5.0.0
 Flask==0.12.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.44.1
+hypothesis==3.44.4
 itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7

From 501cabc6a0f0bca5cadf88d479fa6605181d8e2d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 25 Dec 2017 16:26:14 +0100
Subject: [PATCH 257/322] Update pytest-rerunfailures from 3.1 to 4.0

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index c10c5a2b0..90b60df47 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -30,7 +30,7 @@ pytest-instafail==0.3.0
 pytest-mock==1.6.3
 pytest-qt==2.3.0
 pytest-repeat==0.4.1
-pytest-rerunfailures==3.1
+pytest-rerunfailures==4.0
 pytest-travis-fold==1.3.0
 pytest-xvfb==1.0.0
 PyVirtualDisplay==0.2.1

From d2f0c5dcac50fdbb3452c719f23426214b0272b2 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 26 Dec 2017 15:45:50 +0100
Subject: [PATCH 258/322] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index f7bd8ae2c..4e51f1c5b 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -133,6 +133,7 @@ Fixed
 - Fix :click-element with an ID containing non-alphanumeric characters.
 - Fix crash when a subprocess outputs data which is not decodable as UTF-8.
 - Fix crash when closing a tab immediately after hinting.
+- Worked around issues in Qt 5.10 with loading progress never being finished.
 
 Deprecated
 ~~~~~~~~~~

From b5a9612840d5f348746904e09b25b63f342f19c2 Mon Sep 17 00:00:00 2001
From: Allen Zheng <strburst@users.noreply.github.com>
Date: Tue, 26 Dec 2017 11:21:02 -0500
Subject: [PATCH 259/322] Fix minor doc typo in example code

There should be an extra parenthesis to close the call to the outer
print function.
---
 doc/help/configuring.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/help/configuring.asciidoc b/doc/help/configuring.asciidoc
index 766e6bc7f..a9b7b6ddf 100644
--- a/doc/help/configuring.asciidoc
+++ b/doc/help/configuring.asciidoc
@@ -264,7 +264,7 @@ get a string:
 .config.py:
 [source,python]
 ----
-print(str(config.configdir / 'config.py')
+print(str(config.configdir / 'config.py'))
 ----
 
 Handling errors

From 9cb25e0c76e80b311898fd5aace7c27ac2169bdc Mon Sep 17 00:00:00 2001
From: RyanJenkins <rjenkins@mail.sfsu.edu>
Date: Tue, 26 Dec 2017 20:19:39 -0800
Subject: [PATCH 260/322] Raise browser window after editor closes regardless
 of outcome of inserting text and avoid calling
 QApplication.instance().alert() in this scenario.

---
 qutebrowser/browser/commands.py      | 3 ++-
 qutebrowser/mainwindow/mainwindow.py | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index a912842f6..3fffbcfb7 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1639,12 +1639,13 @@ class CommandDispatcher:
         """
         try:
             elem.set_value(text)
-            mainwindow.raise_window(objreg.last_focused_window())
         except webelem.OrphanedError as e:
             message.error('Edited element vanished')
         except webelem.Error as e:
             raise cmdexc.CommandError(str(e))
 
+        mainwindow.raise_window(objreg.last_focused_window(), alert=False)
+
     @cmdutils.register(instance='command-dispatcher', maxsplit=0,
                        scope='window')
     def insert_text(self, text):
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 3adce7567..9d288b565 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -94,13 +94,15 @@ def get_window(via_ipc, force_window=False, force_tab=False,
     return window.win_id
 
 
-def raise_window(window):
+def raise_window(window, alert=False):
     """Raise the given MainWindow object."""
     window.setWindowState(window.windowState() & ~Qt.WindowMinimized)
     window.setWindowState(window.windowState() | Qt.WindowActive)
     window.raise_()
     window.activateWindow()
-    QApplication.instance().alert(window)
+
+    if alert:
+        QApplication.instance().alert(window)
 
 
 # WORKAROUND for https://github.com/PyCQA/pylint/issues/1770

From 53575aaeed5a1e8389bbf0980fed757e85c34349 Mon Sep 17 00:00:00 2001
From: RyanJenkins <rjenkins@mail.sfsu.edu>
Date: Wed, 27 Dec 2017 12:40:55 -0800
Subject: [PATCH 261/322] Default raise_windows() alert param to True to
 preserve existing behavior

---
 qutebrowser/mainwindow/mainwindow.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 9d288b565..dff465c41 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -94,7 +94,7 @@ def get_window(via_ipc, force_window=False, force_tab=False,
     return window.win_id
 
 
-def raise_window(window, alert=False):
+def raise_window(window, alert=True):
     """Raise the given MainWindow object."""
     window.setWindowState(window.windowState() & ~Qt.WindowMinimized)
     window.setWindowState(window.windowState() | Qt.WindowActive)

From 2a7423a515181001c7a0f2c8b4f9f19c82aec95d Mon Sep 17 00:00:00 2001
From: Manuel Seelaus <manuel.seelaus@zoho.com>
Date: Wed, 27 Dec 2017 18:00:02 -0700
Subject: [PATCH 262/322] filter out records with None in any field.

---
 scripts/hist_importer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index 84fada560..526a752e2 100755
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -107,7 +107,7 @@ def clean(history):
     Args:
         history: List of records (datetime, url, title) from source database.
     """
-    nulls = [record for record in history if record[0] is None]
+    nulls = [record for record in history if None in record]
     for null_datetime in nulls:
         history.remove(null_datetime)
     history = [list(record) for record in history]

From 7fe0f9fb165bb6d2da3172e515afda394f4ff108 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 28 Dec 2017 18:01:32 +0100
Subject: [PATCH 263/322] Update qutebrowser xpm

---
 icons/qutebrowser.xpm | 507 +++++++++++++++++++++++++-----------------
 1 file changed, 301 insertions(+), 206 deletions(-)

diff --git a/icons/qutebrowser.xpm b/icons/qutebrowser.xpm
index 8fac91045..04e183154 100644
--- a/icons/qutebrowser.xpm
+++ b/icons/qutebrowser.xpm
@@ -1,207 +1,302 @@
 /* XPM */
-static char *qutebrowser[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 169 2 ",
-"   c #0A396E",
-".  c #0B3C72",
-"X  c #0B4077",
-"o  c #0C437B",
-"O  c #134175",
-"+  c #15467C",
-"@  c #18477B",
-"#  c #1A497D",
-"$  c #0D4B86",
-"%  c #0F4E8D",
-"&  c #124A80",
-"*  c #1F4F83",
-"=  c #0E518C",
-"-  c #1F5084",
-";  c #11508C",
-":  c #0F5193",
-">  c #115799",
-",  c #115B9C",
-"<  c #204F83",
-"1  c #245287",
-"2  c #2A598C",
-"3  c #325E8F",
-"4  c #11609F",
-"5  c #346496",
-"6  c #3B6898",
-"7  c #115CA1",
-"8  c #115EAC",
-"9  c #1263A3",
-"0  c #1260AD",
-"q  c #136BAC",
-"w  c #136BB2",
-"e  c #1366BA",
-"r  c #196BB2",
-"t  c #157ABB",
-"y  c #1577BB",
-"u  c #2E6DB0",
-"i  c #387FB1",
-"p  c #456E9A",
-"a  c #4873A1",
-"s  c #4375AA",
-"d  c #507AA6",
-"f  c #597EA4",
-"g  c #4D7EB3",
-"h  c #156FCB",
-"j  c #167AC5",
-"k  c #1675CA",
-"l  c #177BCE",
-"z  c #1777D8",
-"x  c #1476E4",
-"c  c #167BE6",
-"v  c #167DE8",
-"b  c #197EEF",
-"n  c #1A7FF0",
-"m  c #1A80BE",
-"M  c #5F87AF",
-"N  c #5D8BBA",
-"B  c #5A84B1",
-"V  c #6C8FB3",
-"C  c #6F96BE",
-"Z  c #1886CC",
-"A  c #1883D7",
-"S  c #198DD5",
-"D  c #1987D9",
-"F  c #198ADC",
-"G  c #1A96DC",
-"H  c #3090D9",
-"J  c #1682E9",
-"K  c #1983ED",
-"L  c #1689E9",
-"P  c #1A8DEE",
-"I  c #1B95ED",
-"U  c #1C9EEA",
-"Y  c #1B97E4",
-"T  c #1A84F2",
-"R  c #1A8BF2",
-"E  c #1C94F4",
-"W  c #1D9CF5",
-"Q  c #3388E6",
-"!  c #3D90E9",
-"~  c #228EF3",
-"^  c #229FF6",
-"/  c #3294F4",
-"(  c #3D9FF6",
-")  c #339CF4",
-"_  c #1CA2E5",
-"`  c #1DABEE",
-"'  c #1DA4F6",
-"]  c #1EA9F7",
-"[  c #1EADF8",
-"{  c #1FB4F9",
-"}  c #1FB9FA",
-"|  c #20ACF8",
-" . c #27A4F6",
-".. c #3DA9F6",
-"X. c #20B9FA",
-"o. c #2EB6F9",
-"O. c #458DC9",
-"+. c #5C8DC1",
-"@. c #5795C6",
-"#. c #709DCB",
-"$. c #74A8DD",
-"%. c #4A97EA",
-"&. c #4896EA",
-"*. c #559EEA",
-"=. c #439AF5",
-"-. c #46A3F6",
-";. c #5FA9F6",
-":. c #5EA6F3",
-">. c #47BCF9",
-",. c #51B5F8",
-"<. c #58BDF8",
-"1. c #68ABEF",
-"2. c #7DB9E7",
-"3. c #63AEF7",
-"4. c #6FB1F7",
-"5. c #66B9F8",
-"6. c #61B2F6",
-"7. c #71B4F7",
-"8. c #78B7F4",
-"9. c #72BFF9",
-"0. c #3BC0FA",
-"q. c #6FCEFB",
-"w. c #6CC5FA",
-"e. c #7BCAF9",
-"r. c #89A7C3",
-"t. c #83A2C1",
-"y. c #98B6D3",
-"u. c #9DB9D3",
-"i. c #89B6E4",
-"p. c #83B6E9",
-"a. c #81BDF7",
-"s. c #83BFF8",
-"d. c #9EC4E9",
-"f. c #8CC2F9",
-"g. c #85CDFB",
-"h. c #87C4F9",
-"j. c #92C6F9",
-"k. c #95CAFA",
-"l. c #9CCBFA",
-"z. c #89D7FC",
-"x. c #91D9FC",
-"c. c #9CDEFD",
-"v. c #9ED2FB",
-"b. c #A7CAEC",
-"n. c #B5CEE3",
-"m. c #A1CEFA",
-"M. c #AED0F0",
-"N. c #ACD6FA",
-"B. c #A0DFFC",
-"V. c #AFD8FC",
-"C. c #B5D9FB",
-"Z. c #BCDDFC",
-"A. c #BFDCF5",
-"S. c #ACE3FD",
-"D. c #B5E5FE",
-"F. c #BBE2FC",
-"G. c #CFE5F5",
-"H. c #C3E1FC",
-"J. c #CAE6FD",
-"K. c #CCEBFD",
-"L. c #C4EBFE",
-"P. c #D6EDFE",
-"I. c #DAEEFD",
-"U. c #DEF1FE",
-"Y. c #D6F2FE",
-"T. c #E4F4FE",
-"R. c #E9F6FE",
-"E. c #EBF8FF",
-"W. c None",
-/* pixels */
-"W.W.W.W.W.W.W.W.W.W.W.c.S.L.Y.E.E.S.X.} W.W.W.W.W.W.W.W.W.W.W.W.",
-"W.W.W.W.W.W.W.W.W.D.T.E.E.T.L.D.c.z.} } X.} } W.W.W.W.W.W.W.W.W.",
-"W.W.W.W.W.W.W.B.T.T.R.T.R.U.0.X.z.S.} } } } { { X.W.W.W.W.W.W.W.",
-"W.W.W.W.W.W.x.x.K.T.T.T.L.P.q.o.{ } } ` _ { { { { { W.W.W.W.W.W.",
-"W.W.W.W.W.c.P.D.G.u.r.i 9 Z _ { { G 4 X t { { { { { { W.W.W.W.W.",
-"W.W.W.W.K.U.n.f O             { =       t { { { { [ { { W.W.W.W.",
-"W.W.W.F.I.t..                 '         t { { [ [ [ [ [ >.W.W.W.",
-"W.W.x.P.V                     ' X       t ` [ [ [ [ [ [ o.e.W.W.",
-"W.W.J.y.        X t S Y Z $   ' .       y [ [ [ ] [ [ | Z.J.W.W.",
-"W.<.e.&       , _ ] ] [ ] U . ' .       y [ ' [ ] ] ] w.K.J.g.W.",
-"W.' S       o ' ' [ ' [ ' ] o ' .       y Y 9 = = 9 @.J.J.J.F.W.",
-"W.| ,       j ' ' ' ' ' ' ' o ' .       $             p A.J.J.g.",
-"'  ..       G ' ' ' ' ' ' ' o ' .                       M H.H.h.",
-",.2.      . W ' W ' ' ' ' W . '                         . M.A.x.",
-"N.M..     . W W W ' W W W W  .w           9 I U 0         #.Z.m.",
-" .9.O       D W W W W ' W j $         % F W W W  .5       d Z.C.",
-"W W ;       9 9.h.5...Q %         o j W W W W W W O.      3 C.N.",
-"E W 7         B b.d.a         . w E E W W W E W E A       @ C.l.",
-"I E l                         u W E W E W E E E E A .     - k.6.",
-"P E E 7                       m.o E E E E E E E E l .     = E P ",
-"L E E E >           . O       s.o E E E E E E E E 7       , E L ",
-"W.R E R ) #.5 1 6 N i.2       s.+ E E E E E E R L .       k R W.",
-"W.L R E -.m.m.m.m.m.m.2       m.@ N m.m.s.( R R %       X E J W.",
-"W.W.K R ~ a.m.l.l.l.l.2       s.+ < i.l.m.j.h %         e K W.W.",
-"W.W.J R R / l.l.l.l.k.2       s.+     * 5 +           8 R J W.W.",
-"W.W.W.v T R 3.k.k.j.k.2     2 j.&                 . 8 R v W.W.W.",
-"W.W.W.W.J T ~ 7.j.j.j.g +.p.j.s.+.  .         . : z T v W.W.W.W.",
-"W.W.W.W.W.c T T =.f.j.j.s.j.j.j.j.$.g s u e h b T T v W.W.W.W.W.",
-"W.W.W.W.W.W.c b n 4.f.f.s.m.s.s.s.j.s.j./ T n T b c W.W.W.W.W.W.",
-"W.W.W.W.W.W.W.c x 1.s.s.s.s.s.s.s.s.4.=.n T n c c W.W.W.W.W.W.W.",
-"W.W.W.W.W.W.W.W.W.&.*.1.a.s.s.s.s.3.n n v x x W.W.W.W.W.W.W.W.W.",
-"W.W.W.W.W.W.W.W.W.W.W.%.%.%.%.*.*.Q x x x W.W.W.W.W.W.W.W.W.W.W."
-};
+static char * qutebrowser_xpm[] = {
+"32 32 267 2",
+"  	c None",
+". 	c #9FD4FD",
+"+ 	c #99CBFE",
+"@ 	c #90C3FE",
+"# 	c #89BFFE",
+"$ 	c #81BCFF",
+"% 	c #80BBFF",
+"& 	c #9BCAFD",
+"* 	c #A9DBFB",
+"= 	c #88D3FB",
+"- 	c #98CBFE",
+"; 	c #81BBFF",
+"> 	c #7EBAFF",
+", 	c #84BDFF",
+"' 	c #8DC2FF",
+") 	c #96C7FE",
+"! 	c #A0CCFE",
+"~ 	c #A9D1FE",
+"{ 	c #CEE5FD",
+"] 	c #C7E3FC",
+"^ 	c #8AD3FB",
+"/ 	c #9DCFFD",
+"( 	c #C3DFFD",
+"_ 	c #CDE4FD",
+": 	c #A3CEFE",
+"< 	c #94C6FE",
+"[ 	c #CAE5FC",
+"} 	c #7DD0FB",
+"| 	c #9ECDFD",
+"1 	c #A1CDFE",
+"2 	c #8BC1FF",
+"3 	c #87BFFF",
+"4 	c #ADD4FE",
+"5 	c #C6E1FD",
+"6 	c #CCE3FC",
+"7 	c #A7DAFB",
+"8 	c #9DCBFE",
+"9 	c #78AFF1",
+"0 	c #6096D4",
+"a 	c #4B82C0",
+"b 	c #5A84B3",
+"c 	c #6589B1",
+"d 	c #6F92B9",
+"e 	c #90AED0",
+"f 	c #C4DBF5",
+"g 	c #6286AE",
+"h 	c #7D9EC2",
+"i 	c #BADFFC",
+"j 	c #85BDFE",
+"k 	c #78B4F8",
+"l 	c #4C83C0",
+"m 	c #1E4F87",
+"n 	c #0A396E",
+"o 	c #345D8D",
+"p 	c #CDE4FC",
+"q 	c #88A7CA",
+"r 	c #1D497C",
+"s 	c #799BBF",
+"t 	c #8AC1FD",
+"u 	c #5E97D7",
+"v 	c #14457B",
+"w 	c #4F76A0",
+"x 	c #A9D5FC",
+"y 	c #95C9FD",
+"z 	c #4C82C1",
+"A 	c #0A3A6F",
+"B 	c #C9E3FD",
+"C 	c #95CCFC",
+"D 	c #629BDB",
+"E 	c #0B3A6F",
+"F 	c #0C3B6F",
+"G 	c #4E749F",
+"H 	c #8CACCE",
+"I 	c #6185AD",
+"J 	c #CBE4FD",
+"K 	c #89C0FF",
+"L 	c #98CDFA",
+"M 	c #27558A",
+"N 	c #144175",
+"O 	c #9BB8D8",
+"P 	c #335D8C",
+"Q 	c #AFC9E6",
+"R 	c #AFD4FE",
+"S 	c #91C7FD",
+"T 	c #A0C0DE",
+"U 	c #194779",
+"V 	c #80A1C5",
+"W 	c #C8E1F9",
+"X 	c #9CB9D8",
+"Y 	c #7799BE",
+"Z 	c #6489B0",
+"` 	c #7092B9",
+" .	c #6E9DCF",
+"..	c #79B5F9",
+"+.	c #83BDFE",
+"@.	c #7395BA",
+"#.	c #315C8B",
+"$.	c #7C9EC2",
+"%.	c #C0D9F3",
+"&.	c #7294BA",
+"*.	c #5C94D4",
+"=.	c #91CCFC",
+"-.	c #88CBFA",
+";.	c #5179A3",
+">.	c #6E91B7",
+",.	c #6084AC",
+"'.	c #96B3D4",
+").	c #275283",
+"!.	c #0C3C71",
+"~.	c #629CDC",
+"{.	c #94C6FD",
+"].	c #A7D2FC",
+"^.	c #36659A",
+"/.	c #2C5788",
+"(.	c #9DBAD9",
+"_.	c #B4CEEA",
+":.	c #476E9A",
+"<.	c #7EB9FE",
+"[.	c #8DC3FD",
+"}.	c #8CC2FE",
+"|.	c #2F619B",
+"1.	c #87A6C9",
+"2.	c #7A9BC0",
+"3.	c #CBE2FB",
+"4.	c #C7DFF8",
+"5.	c #6C8FB5",
+"6.	c #113F73",
+"7.	c #0F3D71",
+"8.	c #547AA4",
+"9.	c #9CBAD9",
+"0.	c #B9D3EE",
+"a.	c #A3C0DE",
+"b.	c #31629A",
+"c.	c #659EE0",
+"d.	c #87BFFE",
+"e.	c #C3E0FD",
+"f.	c #4371A4",
+"g.	c #7496BB",
+"h.	c #90AFD1",
+"i.	c #245081",
+"j.	c #416A96",
+"k.	c #B0CBE7",
+"l.	c #CCE4FD",
+"m.	c #7DB8FD",
+"n.	c #1E5088",
+"o.	c #497EBC",
+"p.	c #C9E3FC",
+"q.	c #7193B9",
+"r.	c #C6E0FB",
+"s.	c #A2CDFE",
+"t.	c #97C8FE",
+"u.	c #A7D0FE",
+"v.	c #BDDCFD",
+"w.	c #9EC2E8",
+"x.	c #416996",
+"y.	c #366AA6",
+"z.	c #C0DEFC",
+"A.	c #A2BFDD",
+"B.	c #326299",
+"C.	c #649DDF",
+"D.	c #71ABED",
+"E.	c #3569A4",
+"F.	c #0D3C71",
+"G.	c #6998CD",
+"H.	c #30639D",
+"I.	c #A8D3F8",
+"J.	c #2B5686",
+"K.	c #3A679B",
+"L.	c #ADCAEA",
+"M.	c #85A6C9",
+"N.	c #33639B",
+"O.	c #9CCBFD",
+"P.	c #86C2F7",
+"Q.	c #0E3C71",
+"R.	c #1B4C83",
+"S.	c #5D95D5",
+"T.	c #557BA5",
+"U.	c #85C0F6",
+"V.	c #55A8EF",
+"W.	c #94B3D3",
+"X.	c #1C497C",
+"Y.	c #13437A",
+"Z.	c #487DBB",
+"`.	c #7BB7FB",
+" +	c #76B1F5",
+".+	c #4E85C3",
+"++	c #ACD3FE",
+"@+	c #2F5989",
+"#+	c #7597BC",
+"$+	c #53A7EF",
+"%+	c #C6E1FC",
+"&+	c #B6D5F7",
+"*+	c #5890D0",
+"=+	c #4076B2",
+"-+	c #619ADB",
+";+	c #7CB7FC",
+">+	c #7DB9FE",
+",+	c #5087C6",
+"'+	c #134479",
+")+	c #23548D",
+"!+	c #24558D",
+"~+	c #8AAACC",
+"{+	c #A2C1E1",
+"]+	c #86C1F5",
+"^+	c #B4D7FE",
+"/+	c #6CA5E8",
+"(+	c #22548C",
+"_+	c #6D94BF",
+":+	c #98B6D6",
+"<+	c #134174",
+"[+	c #84BDF5",
+"}+	c #CAE4FC",
+"|+	c #CBE3FD",
+"1+	c #8FC3FF",
+"2+	c #3F72AD",
+"3+	c #49719C",
+"4+	c #0C3B70",
+"5+	c #9CBBDB",
+"6+	c #79B7F3",
+"7+	c #BFDCFD",
+"8+	c #7FBBFF",
+"9+	c #7E9FC3",
+"0+	c #77B6F3",
+"a+	c #A5CEF7",
+"b+	c #9FCBFE",
+"c+	c #3267A1",
+"d+	c #A4CDF7",
+"e+	c #B9D9FA",
+"f+	c #C7E1FD",
+"g+	c #90C3FF",
+"h+	c #15457C",
+"i+	c #558CCB",
+"j+	c #2E5889",
+"k+	c #7B9CC1",
+"l+	c #C4DDF6",
+"m+	c #BBDAFA",
+"n+	c #CDE5FD",
+"o+	c #B3D6FE",
+"p+	c #80BAFF",
+"q+	c #4E84C3",
+"r+	c #3E73AF",
+"s+	c #78B3F7",
+"t+	c #5991D1",
+"u+	c #477DBA",
+"v+	c #4075B2",
+"w+	c #5783B6",
+"x+	c #BDD6F0",
+"y+	c #A1CBF6",
+"z+	c #90C4FF",
+"A+	c #BCDBFD",
+"B+	c #73B0F1",
+"C+	c #C5E0FB",
+"D+	c #91C5FF",
+"E+	c #AED3FE",
+"F+	c #C9E2FC",
+"G+	c #76B2F2",
+"H+	c #8BBFF9",
+"I+	c #81BBFE",
+"J+	c #9ECBFE",
+"K+	c #84B8F3",
+"L+	c #79B4F4",
+"M+	c #88BEFA",
+"N+	c #83BCFE",
+"O+	c #A4CFFC",
+"P+	c #A6CDF6",
+"Q+	c #82B8F2",
+"R+	c #529BEC",
+"                      . + @ # $ % & * =                         ",
+"                  - ; > > , ' ) ! ~ { { { ] ^                   ",
+"              / ; > > > > ; ( _ : < { { { { { [ }               ",
+"            | 1 2 > > > 2 3 4 5 { { { { { 6 { { { 7             ",
+"          8 $ < 9 0 a b c d e { { { { f g h { { { { i           ",
+"        j k l m n n n n n n o { { p q r n s { { { { { i         ",
+"      t u v n n n n n n n n o { { w n n n s { { { { { { x       ",
+"    y z A n n n n n n n n n o { { o n n n s { { { { { { B C     ",
+"    D E n n n F G H I n n n o { { o n n n s { { { { { J K %     ",
+"  L M n n n N O { { s n n n o { { o n n P Q { { { { { R > > S   ",
+"  T n n n n H { { { s n n n o { { o U V 6 W X Y Z `  ...> > +.  ",
+"  @.n n n #.{ { { { s n n n o { { $.%.W &.U n n n n n v *.> > =.",
+"-.;.n n n >.{ { { { s n n n ,.{ { { '.).n n n n n n n n !.~.> {.",
+"].^.n n n q { { { { s n /.(.{ { _.:.n n n n n n n n n n n m <.[.",
+"}.|.n n n H { { { { 1.2.3.{ 4.5.6.n n n 7.8.9.0.a.b.n n n n c.d.",
+"e.f.n n n g.{ { { { { { { h.i.n n n n j.k.{ { { l.m.n.n n n o.$ ",
+"p.q.n n n /.r.s.t.u.v.w.x.n n n n i.h.{ { { { { { u.o.n n n y.$ ",
+"z.A.n n n n B.C.D.u E.F.n n n 6.5.4.{ 3.2.1.{ { { { G.n n n H.d.",
+"I.p J.n n n n n n n n n n n K.L.{ { (./.n s { { { { M.n n n N.O.",
+"P.{ (.Q.n n n n n n n n R.S.> K _ ,.n n n s { { { { 5.n n n T.U.",
+"V.{ { W.X.n n n n n Y.Z.`. +.+> ++o n n n s { { { { @+n n n #+$+",
+"  %+{ { &+*+Z.=+a -+;+>+,+'+)+> > !+n n n s { { { ~+n n n n {+  ",
+"  ]+{ { ^+> > > > > /+(+n n )+> > )+n n n _+{ { :+<+n n n o [+  ",
+"    }+{ |+1+> > > > l n n n )+> > )+n n n 2+~+3+E n n n 4+5+    ",
+"    6+{ { 7+8+> > > l n n n )+> > )+n n n n n n n n n F 9+0+    ",
+"      a+{ { b+> > > l n n n c+> > )+n n n n n n n n r O d+      ",
+"        e+{ f+g+> > l n h+i+<.> > )+n n n n n E j+k+l+m+        ",
+"          e+{ n+o+p+q+r+s+> > > > t+u+v+w+2.W.x+{ { e+          ",
+"            y+{ { z+>+> > > > > > > > > A+{ { { { d+            ",
+"              B+C+) > > > > > > > > D+E+{ { { F+G+              ",
+"                  H+I+> > > > > > J+{ { { C+K+                  ",
+"                      L+M+# N+; 8+O+P+Q+R+                      "};

From a6adbdf167b657e02979559ac5fc5923b2caf7af Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 29 Dec 2017 19:10:33 +0100
Subject: [PATCH 264/322] Clean up testbrowser scripts

---
 .gitignore                                    | 16 +++---
 .../cpp}/webengine/main.cpp                   |  0
 .../cpp}/webengine/testbrowser.pro            |  0
 .../cpp}/webkit/main.cpp                      |  0
 .../cpp}/webkit/testbrowser.pro               |  0
 scripts/testbrowser/testbrowser_webengine.py  | 50 +++++++++++++++++
 scripts/testbrowser/testbrowser_webkit.py     | 56 +++++++++++++++++++
 7 files changed, 114 insertions(+), 8 deletions(-)
 rename scripts/{testbrowser_cpp => testbrowser/cpp}/webengine/main.cpp (100%)
 rename scripts/{testbrowser_cpp => testbrowser/cpp}/webengine/testbrowser.pro (100%)
 rename scripts/{testbrowser_cpp => testbrowser/cpp}/webkit/main.cpp (100%)
 rename scripts/{testbrowser_cpp => testbrowser/cpp}/webkit/testbrowser.pro (100%)
 create mode 100755 scripts/testbrowser/testbrowser_webengine.py
 create mode 100755 scripts/testbrowser/testbrowser_webkit.py

diff --git a/.gitignore b/.gitignore
index cb244557b..54a0dcae6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,12 +31,12 @@ __pycache__
 /prof
 /venv
 TODO
-/scripts/testbrowser_cpp/webkit/Makefile
-/scripts/testbrowser_cpp/webkit/main.o
-/scripts/testbrowser_cpp/webkit/testbrowser
-/scripts/testbrowser_cpp/webkit/.qmake.stash
-/scripts/testbrowser_cpp/webengine/Makefile
-/scripts/testbrowser_cpp/webengine/main.o
-/scripts/testbrowser_cpp/webengine/testbrowser
-/scripts/testbrowser_cpp/webengine/.qmake.stash
+/scripts/testbrowser/cpp/webkit/Makefile
+/scripts/testbrowser/cpp/webkit/main.o
+/scripts/testbrowser/cpp/webkit/testbrowser
+/scripts/testbrowser/cpp/webkit/.qmake.stash
+/scripts/testbrowser/cpp/webengine/Makefile
+/scripts/testbrowser/cpp/webengine/main.o
+/scripts/testbrowser/cpp/webengine/testbrowser
+/scripts/testbrowser/cpp/webengine/.qmake.stash
 /scripts/dev/pylint_checkers/qute_pylint.egg-info
diff --git a/scripts/testbrowser_cpp/webengine/main.cpp b/scripts/testbrowser/cpp/webengine/main.cpp
similarity index 100%
rename from scripts/testbrowser_cpp/webengine/main.cpp
rename to scripts/testbrowser/cpp/webengine/main.cpp
diff --git a/scripts/testbrowser_cpp/webengine/testbrowser.pro b/scripts/testbrowser/cpp/webengine/testbrowser.pro
similarity index 100%
rename from scripts/testbrowser_cpp/webengine/testbrowser.pro
rename to scripts/testbrowser/cpp/webengine/testbrowser.pro
diff --git a/scripts/testbrowser_cpp/webkit/main.cpp b/scripts/testbrowser/cpp/webkit/main.cpp
similarity index 100%
rename from scripts/testbrowser_cpp/webkit/main.cpp
rename to scripts/testbrowser/cpp/webkit/main.cpp
diff --git a/scripts/testbrowser_cpp/webkit/testbrowser.pro b/scripts/testbrowser/cpp/webkit/testbrowser.pro
similarity index 100%
rename from scripts/testbrowser_cpp/webkit/testbrowser.pro
rename to scripts/testbrowser/cpp/webkit/testbrowser.pro
diff --git a/scripts/testbrowser/testbrowser_webengine.py b/scripts/testbrowser/testbrowser_webengine.py
new file mode 100755
index 000000000..e6353dc23
--- /dev/null
+++ b/scripts/testbrowser/testbrowser_webengine.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Very simple browser for testing purposes."""
+
+import sys
+import argparse
+
+from PyQt5.QtCore import QUrl
+from PyQt5.QtWidgets import QApplication
+from PyQt5.QtWebEngineWidgets import QWebEngineView
+
+
+def parse_args():
+    """Parse commandline arguments."""
+    parser = argparse.ArgumentParser()
+    parser.add_argument('url', help='The URL to open')
+    return parser.parse_known_args()[0]
+
+
+if __name__ == '__main__':
+    args = parse_args()
+    app = QApplication(sys.argv)
+    wv = QWebEngineView()
+
+    wv.loadStarted.connect(lambda: print("Loading started"))
+    wv.loadProgress.connect(lambda p: print("Loading progress: {}%".format(p)))
+    wv.loadFinished.connect(lambda: print("Loading finished"))
+
+    wv.load(QUrl.fromUserInput(args.url))
+    wv.show()
+
+    app.exec_()
diff --git a/scripts/testbrowser/testbrowser_webkit.py b/scripts/testbrowser/testbrowser_webkit.py
new file mode 100755
index 000000000..7c7081f18
--- /dev/null
+++ b/scripts/testbrowser/testbrowser_webkit.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Very simple browser for testing purposes."""
+
+import sys
+import argparse
+
+from PyQt5.QtCore import QUrl
+from PyQt5.QtWidgets import QApplication
+from PyQt5.QtWebKit import QWebSettings
+from PyQt5.QtWebKitWidgets import QWebView
+
+
+def parse_args():
+    """Parse commandline arguments."""
+    parser = argparse.ArgumentParser()
+    parser.add_argument('url', help='The URL to open')
+    parser.add_argument('--plugins', '-p', help='Enable plugins',
+                        default=False, action='store_true')
+    return parser.parse_known_args()[0]
+
+
+if __name__ == '__main__':
+    args = parse_args()
+    app = QApplication(sys.argv)
+    wv = QWebView()
+
+    wv.loadStarted.connect(lambda: print("Loading started"))
+    wv.loadProgress.connect(lambda p: print("Loading progress: {}%".format(p)))
+    wv.loadFinished.connect(lambda: print("Loading finished"))
+
+    if args.plugins:
+        wv.settings().setAttribute(QWebSettings.PluginsEnabled, True)
+
+    wv.load(QUrl.fromUserInput(args.url))
+    wv.show()
+
+    app.exec_()

From e7af961be243ff443cd118a1683650180e66f1ca Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 29 Dec 2017 19:36:52 +0100
Subject: [PATCH 265/322] Remove filtering of mouse events

This was needed for the hide-mouse-cursor setting. However, this setting was
removed in 2223a285ef4a49adabe735d558db9ab7b65ff78a, so this code has been dead
since then.
---
 qutebrowser/app.py | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index a2d768923..e3d06391d 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -872,10 +872,6 @@ class EventFilter(QObject):
         super().__init__(parent)
         self._activated = True
         self._handlers = {
-            QEvent.MouseButtonDblClick: self._handle_mouse_event,
-            QEvent.MouseButtonPress: self._handle_mouse_event,
-            QEvent.MouseButtonRelease: self._handle_mouse_event,
-            QEvent.MouseMove: self._handle_mouse_event,
             QEvent.KeyPress: self._handle_key_event,
             QEvent.KeyRelease: self._handle_key_event,
         }
@@ -900,19 +896,6 @@ class EventFilter(QObject):
             # No window available yet, or not a MainWindow
             return False
 
-    def _handle_mouse_event(self, _event):
-        """Handle a mouse event.
-
-        Args:
-            _event: The QEvent which is about to be delivered.
-
-        Return:
-            True if the event should be filtered, False if it's passed through.
-        """
-        # Mouse cursor shown (overrideCursor None) -> don't filter event
-        # Mouse cursor hidden (overrideCursor not None) -> filter event
-        return qApp.overrideCursor() is not None
-
     def eventFilter(self, obj, event):
         """Handle an event.
 

From 28889cf099091a8fb261019bad33c77ef306dbca Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 29 Dec 2017 20:36:55 +0100
Subject: [PATCH 266/322] Use a dict for ModeManager.eventFilter

---
 qutebrowser/keyinput/modeman.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index ad9bd06ee..b8c46476f 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -322,10 +322,13 @@ class ModeManager(QObject):
         if self.mode is None:
             # We got events before mode is set, so just pass them through.
             return False
-        if event.type() == QEvent.KeyPress:
-            return self._eventFilter_keypress(event)
-        else:
-            return self._eventFilter_keyrelease(event)
+
+        handlers = {
+            QEvent.KeyPress: self._eventFilter_keypress,
+            QEvent.KeyRelease: self._eventFilter_keyrelease,
+        }
+        handler = handlers[event.type()]
+        return handler(event)
 
     @cmdutils.register(instance='mode-manager', scope='window')
     def clear_keychain(self):

From f5edd4941e9f1bf5e42d3b88eb770777a32fb6a6 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 30 Dec 2017 18:33:15 +0100
Subject: [PATCH 267/322] Fix MANIFEST.in for testbrowser

---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 54bb613f3..b20c2bc77 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -23,7 +23,7 @@ include qutebrowser/config/configdata.yml
 
 prune www
 prune scripts/dev
-prune scripts/testbrowser_cpp
+prune scripts/testbrowser/cpp
 prune .github
 exclude scripts/asciidoc2html.py
 exclude doc/notes

From 26bbd109529c2b5ac77b34150679175d69020007 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Jan 2018 16:34:10 +0100
Subject: [PATCH 268/322] Update attrs from 17.3.0 to 17.4.0

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index bf7a02389..ccc5852cc 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-attrs==17.3.0
+attrs==17.4.0
 flake8==3.5.0
 flake8-bugbear==17.12.0
 flake8-builtins==1.0.post0

From 9c256740c6e4a354675d0807717345607cad39f8 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Jan 2018 16:34:12 +0100
Subject: [PATCH 269/322] Update attrs from 17.3.0 to 17.4.0

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 90b60df47..bef11554d 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-attrs==17.3.0
+attrs==17.4.0
 beautifulsoup4==4.6.0
 cheroot==6.0.0
 click==6.7

From 8cec185e4b31803ddff78041510dc7d4e098030e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Jan 2018 16:34:13 +0100
Subject: [PATCH 270/322] Update attrs from 17.3.0 to 17.4.0

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 8d95759b2..0d2652698 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-attrs==17.3.0
+attrs==17.4.0
 colorama==0.3.9
 cssutils==1.0.2
 Jinja2==2.10

From a98cd16ff37ad779e7137a21a040a06452577f4f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Jan 2018 16:34:15 +0100
Subject: [PATCH 271/322] Update flake8-polyfill from 1.0.1 to 1.0.2

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index ccc5852cc..f73294005 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -12,7 +12,7 @@ flake8-docstrings==1.1.0
 flake8-future-import==0.4.3
 flake8-mock==0.3
 flake8-per-file-ignores==0.4
-flake8-polyfill==1.0.1
+flake8-polyfill==1.0.2
 flake8-string-format==0.2.3
 flake8-tidy-imports==1.1.0
 flake8-tuple==0.2.13

From 673919451e6a518fd5cfaa18f3602355da696e5a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Jan 2018 16:34:16 +0100
Subject: [PATCH 272/322] Update werkzeug from 0.13 to 0.14.1

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index bef11554d..3e900fe0d 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -36,4 +36,4 @@ pytest-xvfb==1.0.0
 PyVirtualDisplay==0.2.1
 six==1.11.0
 vulture==0.26
-Werkzeug==0.13
+Werkzeug==0.14.1

From 9363bc3f24f0fd330afa7f94e956f2c9056996f1 Mon Sep 17 00:00:00 2001
From: Manuel Seelaus <manuel.seelaus@zoho.com>
Date: Tue, 2 Jan 2018 20:06:29 -0700
Subject: [PATCH 273/322] replace empty titles with an empty string.
 https://github.com/qutebrowser/qutebrowser/pull/3445#issuecomment-354840724

---
 scripts/hist_importer.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index 526a752e2..7b594a580 100755
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -100,16 +100,23 @@ def clean(history):
     """Clean up records from source database.
 
     Receives a list of record and sanityze them in order for them to be
-    properly imported to qutebrowser. Sanitation requires addiing a 4th
+    properly imported to qutebrowser. Sanitation requires adding a 4th
     attribute 'redirect' which is filled with '0's, and also purging all
     records that have a NULL/None datetime attribute.
 
     Args:
         history: List of records (datetime, url, title) from source database.
     """
+    # replace missing titles with an empty string
+    for index, record in enumerate(history):
+        if record[1] is None:
+            cleaned = list(record)
+            cleaned[1] = ''
+            history[index] = tuple(cleaned)
+
     nulls = [record for record in history if None in record]
-    for null_datetime in nulls:
-        history.remove(null_datetime)
+    for null_record in nulls:
+        history.remove(null_record)
     history = [list(record) for record in history]
     for record in history:
         record.append('0')

From c3bcb1d9ba6ab244c2004e2b73fad3de40b77b2d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 3 Jan 2018 10:15:00 +0100
Subject: [PATCH 274/322] Remove old testbrowser.py

---
 scripts/testbrowser.py | 84 ------------------------------------------
 1 file changed, 84 deletions(-)
 delete mode 100755 scripts/testbrowser.py

diff --git a/scripts/testbrowser.py b/scripts/testbrowser.py
deleted file mode 100755
index fbe48c451..000000000
--- a/scripts/testbrowser.py
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/env python3
-# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-#
-# This file is part of qutebrowser.
-#
-# qutebrowser is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# qutebrowser is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Very simple browser for testing purposes."""
-
-import sys
-import argparse
-
-from PyQt5.QtCore import QUrl
-from PyQt5.QtWidgets import QApplication
-
-try:
-    from PyQt5.QtWebKitWidgets import QWebView
-except ImportError:
-    QWebView = None
-
-try:
-    from PyQt5.QtWebEngineWidgets import QWebEngineView
-except ImportError:
-    QWebEngineView = None
-
-
-def parse_args():
-    """Parse commandline arguments."""
-    parser = argparse.ArgumentParser()
-    parser.add_argument('url', help='The URL to open')
-    parser.add_argument('--plugins', '-p', help='Enable plugins',
-                        default=False, action='store_true')
-    if QWebEngineView is not None:
-        parser.add_argument('--webengine', help='Use QtWebEngine',
-                            default=False, action='store_true')
-    return parser.parse_known_args()[0]
-
-
-if __name__ == '__main__':
-    args = parse_args()
-    app = QApplication(sys.argv)
-
-    if QWebView is None and QWebEngineView is None:
-        print("Found no suitable backend to run with!")
-        sys.exit(1)
-    elif QWebView is None and not args.webengine:
-        print("Using QtWebEngine because QtWebKit is unavailable")
-        wv = QWebEngineView()
-        using_webengine = True
-    elif args.webengine:
-        if QWebEngineView is None:
-            print("Requested QtWebEngine, but it could not be imported!")
-            sys.exit(1)
-        wv = QWebEngineView()
-        using_webengine = True
-    else:
-        wv = QWebView()
-        using_webengine = False
-
-    wv.loadStarted.connect(lambda: print("Loading started"))
-    wv.loadProgress.connect(lambda p: print("Loading progress: {}%".format(p)))
-    wv.loadFinished.connect(lambda: print("Loading finished"))
-
-    if args.plugins and not using_webengine:
-        from PyQt5.QtWebKit import QWebSettings
-        wv.settings().setAttribute(QWebSettings.PluginsEnabled, True)
-
-    wv.load(QUrl.fromUserInput(args.url))
-    wv.show()
-
-    app.exec_()

From c290b3f80f41b255a5b46480990d692425a6c253 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Thu, 4 Jan 2018 12:27:19 -0500
Subject: [PATCH 275/322] Don't attempt completion if input starts with flag.

Always interpret the first word in the command string as the command to
offer completions for, even if that word looks like a flag.

Fixes #3460, where the command string `:-w open` would attempt to offer
completions for `open` but crash because the parsing was thrown off.
By moving the flag-stripping logic to _after_ we determine the command,
`:-w open` interprets `:-w` as the command. Since that is not a valid
command, we won't offer any completions.
---
 qutebrowser/completion/completer.py     | 5 +++--
 tests/unit/completion/test_completer.py | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py
index 30a180554..4e187750d 100644
--- a/qutebrowser/completion/completer.py
+++ b/qutebrowser/completion/completer.py
@@ -87,8 +87,6 @@ class Completer(QObject):
             # cursor on a flag or after an explicit split (--)
             return None
         log.completion.debug("Before removing flags: {}".format(before_cursor))
-        before_cursor = [x for x in before_cursor if not x.startswith('-')]
-        log.completion.debug("After removing flags: {}".format(before_cursor))
         if not before_cursor:
             # '|' or 'set|'
             log.completion.debug('Starting command completion')
@@ -99,6 +97,9 @@ class Completer(QObject):
             log.completion.debug("No completion for unknown command: {}"
                                  .format(before_cursor[0]))
             return None
+
+        before_cursor = [x for x in before_cursor if not x.startswith('-')]
+        log.completion.debug("After removing flags: {}".format(before_cursor))
         argpos = len(before_cursor) - 1
         try:
             func = cmd.get_pos_arg_info(argpos).completion
diff --git a/tests/unit/completion/test_completer.py b/tests/unit/completion/test_completer.py
index e25d4e5d1..4b39b7032 100644
--- a/tests/unit/completion/test_completer.py
+++ b/tests/unit/completion/test_completer.py
@@ -190,6 +190,7 @@ def _set_cmd_prompt(cmd, txt):
     (':gibberish nonesense |', None, '', []),
     ('/:help|', None, '', []),
     ('::bind|', 'command', ':bind', []),
+    (':-w open |', None, '', []),
 ])
 def test_update_completion(txt, kind, pattern, pos_args, status_command_stub,
                            completer_obj, completion_widget_stub, config_stub,

From 16fb9bc80e56c8c3088736a1ab2b9e5fd9fc6ef7 Mon Sep 17 00:00:00 2001
From: Andrea Scarpino <scarpino@kde.org>
Date: Thu, 4 Jan 2018 19:46:18 +0100
Subject: [PATCH 276/322] scripts: filter history records

We don't need to import history records about `moz-extensions`, `about` pages, `dactyl` and so on...
---
 scripts/hist_importer.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index 84fada560..07731e61d 100755
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -142,7 +142,8 @@ def run():
     source, dest = args.source, args.dest
     query = {
         'firefox': 'select url,title,last_visit_date/1000000 as date '
-                   'from moz_places',
+                   'from moz_places where url like "http%" or url '
+                   'like "ftp%" or url like "file://%"',
         'chrome': 'select url,title,last_visit_time/10000000 as date '
                   'from urls',
     }

From 3d508be9ff624a9669e101281cae60d28e973a84 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 4 Jan 2018 18:13:31 -0800
Subject: [PATCH 277/322] Clear unpinned tabs before prompting user with
 :tab-only

---
 qutebrowser/browser/commands.py         | 29 ++++++++++++++-----------
 qutebrowser/mainwindow/tabbedbrowser.py |  6 +++--
 tests/end2end/features/tabs.feature     |  4 ++--
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 92a841d72..97c09b1f7 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -953,22 +953,25 @@ class CommandDispatcher:
                         (prev and i < cur_idx) or
                         (next_ and i > cur_idx))
 
-        # Check to see if we are closing any pinned tabs
-        if not force:
-            for i, tab in enumerate(self._tabbed_browser.widgets()):
-                if _to_close(i) and tab.data.pinned:
-                    self._tabbed_browser.tab_close_prompt_if_pinned(
-                        tab,
-                        force,
-                        lambda: self.tab_only(
-                            prev=prev, next_=next_, force=True))
-                    return
-
+        # close as many tabs as we can
         first_tab = True
+        pinned_tabs_cleanup = False
         for i, tab in enumerate(self._tabbed_browser.widgets()):
             if _to_close(i):
-                self._tabbed_browser.close_tab(tab, new_undo=first_tab)
-                first_tab = False
+                if force or not tab.data.pinned:
+                    self._tabbed_browser.close_tab(tab, new_undo=first_tab)
+                    first_tab = False
+                else:
+                    pinned_tabs_cleanup = tab
+
+        # Check to see if we would like to close any pinned tabs
+        if pinned_tabs_cleanup:
+            self._tabbed_browser.tab_close_prompt_if_pinned(
+                pinned_tabs_cleanup,
+                force,
+                lambda: self.tab_only(
+                    prev=prev, next_=next_, force=True),
+                text="Are you sure you want to close pinned tabs?")
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def undo(self):
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index c51a7aaff..d8056d853 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -256,7 +256,9 @@ class TabbedBrowser(tabwidget.TabWidget):
         for tab in self.widgets():
             self._remove_tab(tab)
 
-    def tab_close_prompt_if_pinned(self, tab, force, yes_action):
+    def tab_close_prompt_if_pinned(
+            self, tab, force, yes_action,
+            text="Are you sure you want to close a pinned tab?"):
         """Helper method for tab_close.
 
         If tab is pinned, prompt. If not, run yes_action.
@@ -265,7 +267,7 @@ class TabbedBrowser(tabwidget.TabWidget):
         if tab.data.pinned and not force:
             message.confirm_async(
                 title='Pinned Tab',
-                text="Are you sure you want to close a pinned tab?",
+                text=text,
                 yes_action=yes_action, default=False, abort_on=[tab.destroyed])
         else:
             yes_action()
diff --git a/tests/end2end/features/tabs.feature b/tests/end2end/features/tabs.feature
index b38d87a6e..1c670878e 100644
--- a/tests/end2end/features/tabs.feature
+++ b/tests/end2end/features/tabs.feature
@@ -1183,7 +1183,7 @@ Feature: Tab management
         And I run :tab-pin
         And I run :tab-next
         And I run :tab-only
-        And I wait for "*want to close a pinned tab*" in the log
+        And I wait for "*want to close pinned tabs*" in the log
         And I run :prompt-accept yes
         Then the following tabs should be open:
             - data/numbers/1.txt (active) (pinned)
@@ -1195,7 +1195,7 @@ Feature: Tab management
         And I run :tab-pin
         And I run :tab-next
         And I run :tab-only
-        And I wait for "*want to close a pinned tab*" in the log
+        And I wait for "*want to close pinned tabs*" in the log
         And I run :prompt-accept no
         Then the following tabs should be open:
             - data/numbers/1.txt (active) (pinned)

From a90730bea71a35059be6f203f74dfdbd2475cf24 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 5 Jan 2018 11:36:26 +0100
Subject: [PATCH 278/322] Pin pytest to 3.3.1 for now

See https://github.com/pytest-dev/pytest-bdd/issues/229
---
 misc/requirements/requirements-tests.txt     | 2 +-
 misc/requirements/requirements-tests.txt-raw | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 90b60df47..d11af3bfc 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -21,7 +21,7 @@ parse-type==0.4.2
 pluggy==0.6.0
 py==1.5.2
 py-cpuinfo==3.3.0
-pytest==3.3.1
+pytest==3.3.1  # rq.filter: != 3.3.2
 pytest-bdd==2.19.0
 pytest-benchmark==3.1.1
 pytest-cov==2.5.1
diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw
index 121689980..174eeb7df 100644
--- a/misc/requirements/requirements-tests.txt-raw
+++ b/misc/requirements/requirements-tests.txt-raw
@@ -4,7 +4,7 @@ coverage
 Flask
 hunter
 hypothesis
-pytest
+pytest==3.3.1
 pytest-bdd
 pytest-benchmark
 pytest-cov
@@ -19,3 +19,4 @@ pytest-xvfb
 vulture
 
 #@ ignore: Jinja2, MarkupSafe, colorama
+#@ filter: pytest != 3.3.2

From 555f43c8546c50dbc4e7a9b995e8389ced697d4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nemanja=20Nedeljkovi=C4=87?= <nemanjan00@gmail.com>
Date: Sat, 6 Jan 2018 19:18:17 +0100
Subject: [PATCH 279/322] Add ng-click for hinting to Angular 1.x links

---
 qutebrowser/browser/webelem.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/webelem.py b/qutebrowser/browser/webelem.py
index 4a1cc02b5..bcea5aeb0 100644
--- a/qutebrowser/browser/webelem.py
+++ b/qutebrowser/browser/webelem.py
@@ -42,7 +42,7 @@ Group = enum.Enum('Group', ['all', 'links', 'images', 'url', 'inputs'])
 SELECTORS = {
     Group.all: ('a, area, textarea, select, input:not([type=hidden]), button, '
                 'frame, iframe, link, [onclick], [onmousedown], [role=link], '
-                '[role=option], [role=button], img'),
+                '[role=option], [role=button], img, [ng-click]'),
     Group.links: 'a[href], area[href], link[href], [role=link][href]',
     Group.images: 'img',
     Group.url: '[src], [href]',

From f64af6b64a0554eada2ab3c32f18b1101c8372f0 Mon Sep 17 00:00:00 2001
From: Nemanja Nedeljkovic <nemanjan00@gmail.com>
Date: Sat, 6 Jan 2018 20:45:13 +0100
Subject: [PATCH 280/322] Angular 1 test

---
 tests/end2end/data/hints/html/angular1.html | 25 +++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 tests/end2end/data/hints/html/angular1.html

diff --git a/tests/end2end/data/hints/html/angular1.html b/tests/end2end/data/hints/html/angular1.html
new file mode 100644
index 000000000..9bf365ecb
--- /dev/null
+++ b/tests/end2end/data/hints/html/angular1.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
+<body ng-app="myApp">
+
+<!-- target: hello.txt -->
+
+<div ng-controller="myCtrl">
+	<p>Click the button to run a function:</p>
+	<p ng-click="myFunc()">OK</p>
+	<p>The button has been clicked {{count}} times.</p>
+</div>
+
+<script>
+angular.module('myApp', [])
+	.controller('myCtrl', ['$scope', function($scope) {
+		$scope.count = 0;
+		$scope.myFunc = function() {
+			$scope.count++;
+			window.location = "hello.txt";
+		};
+	}]);
+</script>
+</body>
+</html>

From 22725beede1dd6a61afb65e336baf8832255ce08 Mon Sep 17 00:00:00 2001
From: Nemanja Nedeljkovic <nemanjan00@gmail.com>
Date: Sat, 6 Jan 2018 21:22:12 +0100
Subject: [PATCH 281/322] Maybe fix?

---
 tests/end2end/data/hints/html/angular1.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/end2end/data/hints/html/angular1.html b/tests/end2end/data/hints/html/angular1.html
index 9bf365ecb..95f28a746 100644
--- a/tests/end2end/data/hints/html/angular1.html
+++ b/tests/end2end/data/hints/html/angular1.html
@@ -7,7 +7,7 @@
 
 <div ng-controller="myCtrl">
 	<p>Click the button to run a function:</p>
-	<p ng-click="myFunc()">OK</p>
+	<p id="link" ng-click="myFunc()">OK</p>
 	<p>The button has been clicked {{count}} times.</p>
 </div>
 

From 9bb6ba0823ada12df1d31ea89fc2abc9dd8ed3dc Mon Sep 17 00:00:00 2001
From: Nemanja Nedeljkovic <nemanjan00@gmail.com>
Date: Sat, 6 Jan 2018 22:09:17 +0100
Subject: [PATCH 282/322] Fix

---
 tests/end2end/data/hints/html/angular1.html | 39 +++++++++++----------
 tests/end2end/test_hints_html.py            |  2 +-
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/tests/end2end/data/hints/html/angular1.html b/tests/end2end/data/hints/html/angular1.html
index 95f28a746..de7712c0b 100644
--- a/tests/end2end/data/hints/html/angular1.html
+++ b/tests/end2end/data/hints/html/angular1.html
@@ -1,25 +1,26 @@
 <!DOCTYPE html>
-<html>
-<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
-<body ng-app="myApp">
 
 <!-- target: hello.txt -->
 
-<div ng-controller="myCtrl">
-	<p>Click the button to run a function:</p>
-	<p id="link" ng-click="myFunc()">OK</p>
-	<p>The button has been clicked {{count}} times.</p>
-</div>
+<html>
+	<body ng-app="myApp">
 
-<script>
-angular.module('myApp', [])
-	.controller('myCtrl', ['$scope', function($scope) {
-		$scope.count = 0;
-		$scope.myFunc = function() {
-			$scope.count++;
-			window.location = "hello.txt";
-		};
-	}]);
-</script>
-</body>
+		<div ng-controller="myCtrl">
+			<p>Click the button to run a function:</p>
+			<p id="link" ng-click="myFunc()">OK</p>
+			<p>The button has been clicked {{count}} times.</p>
+		</div>
+
+		<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
+		<script>
+			angular.module('myApp', [])
+			.controller('myCtrl', ['$scope', function($scope) {
+				$scope.count = 0;
+				$scope.myFunc = function() {
+					$scope.count++;
+					window.location = "/data/hello.txt";
+				};
+			}]);
+		</script>
+	</body>
 </html>
diff --git a/tests/end2end/test_hints_html.py b/tests/end2end/test_hints_html.py
index 6654e1388..fb30abefe 100644
--- a/tests/end2end/test_hints_html.py
+++ b/tests/end2end/test_hints_html.py
@@ -106,7 +106,7 @@ def test_hints(test_name, zoom_text_only, zoom_level, find_implementation,
         quteproc.set_setting('hints.find_implementation', find_implementation)
     quteproc.send_cmd(':zoom {}'.format(zoom_level))
     # follow hint
-    quteproc.send_cmd(':hint links normal')
+    quteproc.send_cmd(':hint all normal')
     quteproc.wait_for(message='hints: a', category='hints')
     quteproc.send_cmd(':follow-hint a')
     quteproc.wait_for_load_finished('data/' + parsed.target)

From 64dac66259564f72c58a51a22fc9b82a07c58725 Mon Sep 17 00:00:00 2001
From: Nemanja Nedeljkovic <nemanjan00@gmail.com>
Date: Sun, 7 Jan 2018 11:22:46 +0100
Subject: [PATCH 283/322] local angular

---
 .../data/hints/angular1/angular.min.js        | 332 ++++++++++++++++++
 .../html/{angular1.html => angular.html}      |   2 +-
 2 files changed, 333 insertions(+), 1 deletion(-)
 create mode 100644 tests/end2end/data/hints/angular1/angular.min.js
 rename tests/end2end/data/hints/html/{angular1.html => angular.html} (84%)

diff --git a/tests/end2end/data/hints/angular1/angular.min.js b/tests/end2end/data/hints/angular1/angular.min.js
new file mode 100644
index 000000000..c4bf158ec
--- /dev/null
+++ b/tests/end2end/data/hints/angular1/angular.min.js
@@ -0,0 +1,332 @@
+/*
+ AngularJS v1.6.4
+ (c) 2010-2017 Google, Inc. http://angularjs.org
+ License: MIT
+*/
+(function(x){'use strict';function L(a,b){b=b||Error;return function(){var d=arguments[0],c;c="["+(a?a+":":"")+d+"] http://errors.angularjs.org/1.6.4/"+(a?a+"/":"")+d;for(d=1;d<arguments.length;d++){c=c+(1==d?"?":"&")+"p"+(d-1)+"=";var e=encodeURIComponent,f;f=arguments[d];f="function"==typeof f?f.toString().replace(/ \{[\s\S]*$/,""):"undefined"==typeof f?"undefined":"string"!=typeof f?JSON.stringify(f):f;c+=e(f)}return new b(c)}}function me(a){if(C(a))u(a.objectMaxDepth)&&(Ic.objectMaxDepth=Sb(a.objectMaxDepth)?
+a.objectMaxDepth:NaN);else return Ic}function Sb(a){return ba(a)&&0<a}function qa(a){if(null==a||Wa(a))return!1;if(H(a)||F(a)||B&&a instanceof B)return!0;var b="length"in Object(a)&&a.length;return ba(b)&&(0<=b&&(b-1 in a||a instanceof Array)||"function"===typeof a.item)}function q(a,b,d){var c,e;if(a)if(D(a))for(c in a)"prototype"!==c&&"length"!==c&&"name"!==c&&a.hasOwnProperty(c)&&b.call(d,a[c],c,a);else if(H(a)||qa(a)){var f="object"!==typeof a;c=0;for(e=a.length;c<e;c++)(f||c in a)&&b.call(d,
+a[c],c,a)}else if(a.forEach&&a.forEach!==q)a.forEach(b,d,a);else if(Jc(a))for(c in a)b.call(d,a[c],c,a);else if("function"===typeof a.hasOwnProperty)for(c in a)a.hasOwnProperty(c)&&b.call(d,a[c],c,a);else for(c in a)ua.call(a,c)&&b.call(d,a[c],c,a);return a}function Kc(a,b,d){for(var c=Object.keys(a).sort(),e=0;e<c.length;e++)b.call(d,a[c[e]],c[e]);return c}function Lc(a){return function(b,d){a(d,b)}}function ne(){return++qb}function Tb(a,b,d){for(var c=a.$$hashKey,e=0,f=b.length;e<f;++e){var g=b[e];
+if(C(g)||D(g))for(var h=Object.keys(g),k=0,l=h.length;k<l;k++){var m=h[k],n=g[m];d&&C(n)?ga(n)?a[m]=new Date(n.valueOf()):Xa(n)?a[m]=new RegExp(n):n.nodeName?a[m]=n.cloneNode(!0):Ub(n)?a[m]=n.clone():(C(a[m])||(a[m]=H(n)?[]:{}),Tb(a[m],[n],!0)):a[m]=n}}c?a.$$hashKey=c:delete a.$$hashKey;return a}function S(a){return Tb(a,va.call(arguments,1),!1)}function oe(a){return Tb(a,va.call(arguments,1),!0)}function Z(a){return parseInt(a,10)}function Vb(a,b){return S(Object.create(a),b)}function z(){}function Ya(a){return a}
+function la(a){return function(){return a}}function Wb(a){return D(a.toString)&&a.toString!==ma}function w(a){return"undefined"===typeof a}function u(a){return"undefined"!==typeof a}function C(a){return null!==a&&"object"===typeof a}function Jc(a){return null!==a&&"object"===typeof a&&!Mc(a)}function F(a){return"string"===typeof a}function ba(a){return"number"===typeof a}function ga(a){return"[object Date]"===ma.call(a)}function D(a){return"function"===typeof a}function Xa(a){return"[object RegExp]"===
+ma.call(a)}function Wa(a){return a&&a.window===a}function Za(a){return a&&a.$evalAsync&&a.$watch}function Ha(a){return"boolean"===typeof a}function pe(a){return a&&ba(a.length)&&qe.test(ma.call(a))}function Ub(a){return!(!a||!(a.nodeName||a.prop&&a.attr&&a.find))}function re(a){var b={};a=a.split(",");var d;for(d=0;d<a.length;d++)b[a[d]]=!0;return b}function wa(a){return Q(a.nodeName||a[0]&&a[0].nodeName)}function $a(a,b){var d=a.indexOf(b);0<=d&&a.splice(d,1);return d}function ra(a,b,d){function c(a,
+b,c){c--;if(0>c)return"...";var d=b.$$hashKey,f;if(H(a)){f=0;for(var g=a.length;f<g;f++)b.push(e(a[f],c))}else if(Jc(a))for(f in a)b[f]=e(a[f],c);else if(a&&"function"===typeof a.hasOwnProperty)for(f in a)a.hasOwnProperty(f)&&(b[f]=e(a[f],c));else for(f in a)ua.call(a,f)&&(b[f]=e(a[f],c));d?b.$$hashKey=d:delete b.$$hashKey;return b}function e(a,b){if(!C(a))return a;var d=g.indexOf(a);if(-1!==d)return h[d];if(Wa(a)||Za(a))throw Fa("cpws");var d=!1,e=f(a);void 0===e&&(e=H(a)?[]:Object.create(Mc(a)),
+d=!0);g.push(a);h.push(e);return d?c(a,e,b):e}function f(a){switch(ma.call(a)){case "[object Int8Array]":case "[object Int16Array]":case "[object Int32Array]":case "[object Float32Array]":case "[object Float64Array]":case "[object Uint8Array]":case "[object Uint8ClampedArray]":case "[object Uint16Array]":case "[object Uint32Array]":return new a.constructor(e(a.buffer),a.byteOffset,a.length);case "[object ArrayBuffer]":if(!a.slice){var b=new ArrayBuffer(a.byteLength);(new Uint8Array(b)).set(new Uint8Array(a));
+return b}return a.slice(0);case "[object Boolean]":case "[object Number]":case "[object String]":case "[object Date]":return new a.constructor(a.valueOf());case "[object RegExp]":return b=new RegExp(a.source,a.toString().match(/[^/]*$/)[0]),b.lastIndex=a.lastIndex,b;case "[object Blob]":return new a.constructor([a],{type:a.type})}if(D(a.cloneNode))return a.cloneNode(!0)}var g=[],h=[];d=Sb(d)?d:NaN;if(b){if(pe(b)||"[object ArrayBuffer]"===ma.call(b))throw Fa("cpta");if(a===b)throw Fa("cpi");H(b)?b.length=
+0:q(b,function(a,c){"$$hashKey"!==c&&delete b[c]});g.push(a);h.push(b);return c(a,b,d)}return e(a,d)}function Xb(a,b){return a===b||a!==a&&b!==b}function sa(a,b){if(a===b)return!0;if(null===a||null===b)return!1;if(a!==a&&b!==b)return!0;var d=typeof a,c;if(d===typeof b&&"object"===d)if(H(a)){if(!H(b))return!1;if((d=a.length)===b.length){for(c=0;c<d;c++)if(!sa(a[c],b[c]))return!1;return!0}}else{if(ga(a))return ga(b)?Xb(a.getTime(),b.getTime()):!1;if(Xa(a))return Xa(b)?a.toString()===b.toString():!1;
+if(Za(a)||Za(b)||Wa(a)||Wa(b)||H(b)||ga(b)||Xa(b))return!1;d=V();for(c in a)if("$"!==c.charAt(0)&&!D(a[c])){if(!sa(a[c],b[c]))return!1;d[c]=!0}for(c in b)if(!(c in d)&&"$"!==c.charAt(0)&&u(b[c])&&!D(b[c]))return!1;return!0}return!1}function ab(a,b,d){return a.concat(va.call(b,d))}function bb(a,b){var d=2<arguments.length?va.call(arguments,2):[];return!D(b)||b instanceof RegExp?b:d.length?function(){return arguments.length?b.apply(a,ab(d,arguments,0)):b.apply(a,d)}:function(){return arguments.length?
+b.apply(a,arguments):b.call(a)}}function Nc(a,b){var d=b;"string"===typeof a&&"$"===a.charAt(0)&&"$"===a.charAt(1)?d=void 0:Wa(b)?d="$WINDOW":b&&x.document===b?d="$DOCUMENT":Za(b)&&(d="$SCOPE");return d}function cb(a,b){if(!w(a))return ba(b)||(b=b?2:null),JSON.stringify(a,Nc,b)}function Oc(a){return F(a)?JSON.parse(a):a}function Pc(a,b){a=a.replace(se,"");var d=Date.parse("Jan 01, 1970 00:00:00 "+a)/6E4;return da(d)?b:d}function Yb(a,b,d){d=d?-1:1;var c=a.getTimezoneOffset();b=Pc(b,c);d*=b-c;a=new Date(a.getTime());
+a.setMinutes(a.getMinutes()+d);return a}function xa(a){a=B(a).clone();try{a.empty()}catch(b){}var d=B("<div>").append(a).html();try{return a[0].nodeType===Ia?Q(d):d.match(/^(<[^>]+>)/)[1].replace(/^<([\w-]+)/,function(a,b){return"<"+Q(b)})}catch(c){return Q(d)}}function Qc(a){try{return decodeURIComponent(a)}catch(b){}}function Rc(a){var b={};q((a||"").split("&"),function(a){var c,e,f;a&&(e=a=a.replace(/\+/g,"%20"),c=a.indexOf("="),-1!==c&&(e=a.substring(0,c),f=a.substring(c+1)),e=Qc(e),u(e)&&(f=
+u(f)?Qc(f):!0,ua.call(b,e)?H(b[e])?b[e].push(f):b[e]=[b[e],f]:b[e]=f))});return b}function Zb(a){var b=[];q(a,function(a,c){H(a)?q(a,function(a){b.push($(c,!0)+(!0===a?"":"="+$(a,!0)))}):b.push($(c,!0)+(!0===a?"":"="+$(a,!0)))});return b.length?b.join("&"):""}function db(a){return $(a,!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+")}function $(a,b){return encodeURIComponent(a).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%3B/gi,";").replace(/%20/g,
+b?"%20":"+")}function te(a,b){var d,c,e=Ja.length;for(c=0;c<e;++c)if(d=Ja[c]+b,F(d=a.getAttribute(d)))return d;return null}function ue(a,b){var d,c,e={};q(Ja,function(b){b+="app";!d&&a.hasAttribute&&a.hasAttribute(b)&&(d=a,c=a.getAttribute(b))});q(Ja,function(b){b+="app";var e;!d&&(e=a.querySelector("["+b.replace(":","\\:")+"]"))&&(d=e,c=e.getAttribute(b))});d&&(ve?(e.strictDi=null!==te(d,"strict-di"),b(d,c?[c]:[],e)):x.console.error("Angular: disabling automatic bootstrap. <script> protocol indicates an extension, document.location.href does not match."))}
+function Sc(a,b,d){C(d)||(d={});d=S({strictDi:!1},d);var c=function(){a=B(a);if(a.injector()){var c=a[0]===x.document?"document":xa(a);throw Fa("btstrpd",c.replace(/</,"&lt;").replace(/>/,"&gt;"));}b=b||[];b.unshift(["$provide",function(b){b.value("$rootElement",a)}]);d.debugInfoEnabled&&b.push(["$compileProvider",function(a){a.debugInfoEnabled(!0)}]);b.unshift("ng");c=eb(b,d.strictDi);c.invoke(["$rootScope","$rootElement","$compile","$injector",function(a,b,c,d){a.$apply(function(){b.data("$injector",
+d);c(b)(a)})}]);return c},e=/^NG_ENABLE_DEBUG_INFO!/,f=/^NG_DEFER_BOOTSTRAP!/;x&&e.test(x.name)&&(d.debugInfoEnabled=!0,x.name=x.name.replace(e,""));if(x&&!f.test(x.name))return c();x.name=x.name.replace(f,"");ea.resumeBootstrap=function(a){q(a,function(a){b.push(a)});return c()};D(ea.resumeDeferredBootstrap)&&ea.resumeDeferredBootstrap()}function we(){x.name="NG_ENABLE_DEBUG_INFO!"+x.name;x.location.reload()}function xe(a){a=ea.element(a).injector();if(!a)throw Fa("test");return a.get("$$testability")}
+function Tc(a,b){b=b||"_";return a.replace(ye,function(a,c){return(c?b:"")+a.toLowerCase()})}function ze(){var a;if(!Uc){var b=rb();(na=w(b)?x.jQuery:b?x[b]:void 0)&&na.fn.on?(B=na,S(na.fn,{scope:Na.scope,isolateScope:Na.isolateScope,controller:Na.controller,injector:Na.injector,inheritedData:Na.inheritedData}),a=na.cleanData,na.cleanData=function(b){for(var c,e=0,f;null!=(f=b[e]);e++)(c=na._data(f,"events"))&&c.$destroy&&na(f).triggerHandler("$destroy");a(b)}):B=W;ea.element=B;Uc=!0}}function fb(a,
+b,d){if(!a)throw Fa("areq",b||"?",d||"required");return a}function sb(a,b,d){d&&H(a)&&(a=a[a.length-1]);fb(D(a),b,"not a function, got "+(a&&"object"===typeof a?a.constructor.name||"Object":typeof a));return a}function Ka(a,b){if("hasOwnProperty"===a)throw Fa("badname",b);}function Vc(a,b,d){if(!b)return a;b=b.split(".");for(var c,e=a,f=b.length,g=0;g<f;g++)c=b[g],a&&(a=(e=a)[c]);return!d&&D(a)?bb(e,a):a}function tb(a){for(var b=a[0],d=a[a.length-1],c,e=1;b!==d&&(b=b.nextSibling);e++)if(c||a[e]!==
+b)c||(c=B(va.call(a,0,e))),c.push(b);return c||a}function V(){return Object.create(null)}function $b(a){if(null==a)return"";switch(typeof a){case "string":break;case "number":a=""+a;break;default:a=!Wb(a)||H(a)||ga(a)?cb(a):a.toString()}return a}function Ae(a){function b(a,b,c){return a[b]||(a[b]=c())}var d=L("$injector"),c=L("ng");a=b(a,"angular",Object);a.$$minErr=a.$$minErr||L;return b(a,"module",function(){var a={};return function(f,g,h){var k={};if("hasOwnProperty"===f)throw c("badname","module");
+g&&a.hasOwnProperty(f)&&(a[f]=null);return b(a,f,function(){function a(b,c,d,f){f||(f=e);return function(){f[d||"push"]([b,c,arguments]);return v}}function b(a,c,d){d||(d=e);return function(b,e){e&&D(e)&&(e.$$moduleName=f);d.push([a,c,arguments]);return v}}if(!g)throw d("nomod",f);var e=[],p=[],r=[],J=a("$injector","invoke","push",p),v={_invokeQueue:e,_configBlocks:p,_runBlocks:r,info:function(a){if(u(a)){if(!C(a))throw c("aobj","value");k=a;return this}return k},requires:g,name:f,provider:b("$provide",
+"provider"),factory:b("$provide","factory"),service:b("$provide","service"),value:a("$provide","value"),constant:a("$provide","constant","unshift"),decorator:b("$provide","decorator",p),animation:b("$animateProvider","register"),filter:b("$filterProvider","register"),controller:b("$controllerProvider","register"),directive:b("$compileProvider","directive"),component:b("$compileProvider","component"),config:J,run:function(a){r.push(a);return this}};h&&J(h);return v})}})}function pa(a,b){if(H(a)){b=
+b||[];for(var d=0,c=a.length;d<c;d++)b[d]=a[d]}else if(C(a))for(d in b=b||{},a)if("$"!==d.charAt(0)||"$"!==d.charAt(1))b[d]=a[d];return b||a}function Be(a,b){var d=[];Sb(b)&&(a=ra(a,null,b));return JSON.stringify(a,function(a,b){b=Nc(a,b);if(C(b)){if(0<=d.indexOf(b))return"...";d.push(b)}return b})}function Ce(a){S(a,{errorHandlingConfig:me,bootstrap:Sc,copy:ra,extend:S,merge:oe,equals:sa,element:B,forEach:q,injector:eb,noop:z,bind:bb,toJson:cb,fromJson:Oc,identity:Ya,isUndefined:w,isDefined:u,isString:F,
+isFunction:D,isObject:C,isNumber:ba,isElement:Ub,isArray:H,version:De,isDate:ga,lowercase:Q,uppercase:ub,callbacks:{$$counter:0},getTestability:xe,reloadWithDebugInfo:we,$$minErr:L,$$csp:Ga,$$encodeUriSegment:db,$$encodeUriQuery:$,$$stringify:$b});ac=Ae(x);ac("ng",["ngLocale"],["$provide",function(a){a.provider({$$sanitizeUri:Ee});a.provider("$compile",Wc).directive({a:Fe,input:Xc,textarea:Xc,form:Ge,script:He,select:Ie,option:Je,ngBind:Ke,ngBindHtml:Le,ngBindTemplate:Me,ngClass:Ne,ngClassEven:Oe,
+ngClassOdd:Pe,ngCloak:Qe,ngController:Re,ngForm:Se,ngHide:Te,ngIf:Ue,ngInclude:Ve,ngInit:We,ngNonBindable:Xe,ngPluralize:Ye,ngRepeat:Ze,ngShow:$e,ngStyle:af,ngSwitch:bf,ngSwitchWhen:cf,ngSwitchDefault:df,ngOptions:ef,ngTransclude:ff,ngModel:gf,ngList:hf,ngChange:jf,pattern:Yc,ngPattern:Yc,required:Zc,ngRequired:Zc,minlength:$c,ngMinlength:$c,maxlength:ad,ngMaxlength:ad,ngValue:kf,ngModelOptions:lf}).directive({ngInclude:mf}).directive(vb).directive(bd);a.provider({$anchorScroll:nf,$animate:of,$animateCss:pf,
+$$animateJs:qf,$$animateQueue:rf,$$AnimateRunner:sf,$$animateAsyncRun:tf,$browser:uf,$cacheFactory:vf,$controller:wf,$document:xf,$$isDocumentHidden:yf,$exceptionHandler:zf,$filter:cd,$$forceReflow:Af,$interpolate:Bf,$interval:Cf,$http:Df,$httpParamSerializer:Ef,$httpParamSerializerJQLike:Ff,$httpBackend:Gf,$xhrFactory:Hf,$jsonpCallbacks:If,$location:Jf,$log:Kf,$parse:Lf,$rootScope:Mf,$q:Nf,$$q:Of,$sce:Pf,$sceDelegate:Qf,$sniffer:Rf,$templateCache:Sf,$templateRequest:Tf,$$testability:Uf,$timeout:Vf,
+$window:Wf,$$rAF:Xf,$$jqLite:Yf,$$Map:Zf,$$cookieReader:$f})}]).info({angularVersion:"1.6.4"})}function gb(a,b){return b.toUpperCase()}function wb(a){return a.replace(ag,gb)}function bc(a){a=a.nodeType;return 1===a||!a||9===a}function dd(a,b){var d,c,e=b.createDocumentFragment(),f=[];if(cc.test(a)){d=e.appendChild(b.createElement("div"));c=(bg.exec(a)||["",""])[1].toLowerCase();c=ha[c]||ha._default;d.innerHTML=c[1]+a.replace(cg,"<$1></$2>")+c[2];for(c=c[0];c--;)d=d.lastChild;f=ab(f,d.childNodes);
+d=e.firstChild;d.textContent=""}else f.push(b.createTextNode(a));e.textContent="";e.innerHTML="";q(f,function(a){e.appendChild(a)});return e}function W(a){if(a instanceof W)return a;var b;F(a)&&(a=T(a),b=!0);if(!(this instanceof W)){if(b&&"<"!==a.charAt(0))throw dc("nosel");return new W(a)}if(b){b=x.document;var d;a=(d=dg.exec(a))?[b.createElement(d[1])]:(d=dd(a,b))?d.childNodes:[];ec(this,a)}else D(a)?ed(a):ec(this,a)}function fc(a){return a.cloneNode(!0)}function xb(a,b){!b&&bc(a)&&B.cleanData([a]);
+a.querySelectorAll&&B.cleanData(a.querySelectorAll("*"))}function fd(a,b,d,c){if(u(c))throw dc("offargs");var e=(c=yb(a))&&c.events,f=c&&c.handle;if(f)if(b){var g=function(b){var c=e[b];u(d)&&$a(c||[],d);u(d)&&c&&0<c.length||(a.removeEventListener(b,f),delete e[b])};q(b.split(" "),function(a){g(a);zb[a]&&g(zb[a])})}else for(b in e)"$destroy"!==b&&a.removeEventListener(b,f),delete e[b]}function gc(a,b){var d=a.ng339,c=d&&hb[d];c&&(b?delete c.data[b]:(c.handle&&(c.events.$destroy&&c.handle({},"$destroy"),
+fd(a)),delete hb[d],a.ng339=void 0))}function yb(a,b){var d=a.ng339,d=d&&hb[d];b&&!d&&(a.ng339=d=++eg,d=hb[d]={events:{},data:{},handle:void 0});return d}function hc(a,b,d){if(bc(a)){var c,e=u(d),f=!e&&b&&!C(b),g=!b;a=(a=yb(a,!f))&&a.data;if(e)a[wb(b)]=d;else{if(g)return a;if(f)return a&&a[wb(b)];for(c in b)a[wb(c)]=b[c]}}}function Ab(a,b){return a.getAttribute?-1<(" "+(a.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").indexOf(" "+b+" "):!1}function Bb(a,b){b&&a.setAttribute&&q(b.split(" "),
+function(b){a.setAttribute("class",T((" "+(a.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").replace(" "+T(b)+" "," ")))})}function Cb(a,b){if(b&&a.setAttribute){var d=(" "+(a.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ");q(b.split(" "),function(a){a=T(a);-1===d.indexOf(" "+a+" ")&&(d+=a+" ")});a.setAttribute("class",T(d))}}function ec(a,b){if(b)if(b.nodeType)a[a.length++]=b;else{var d=b.length;if("number"===typeof d&&b.window!==b){if(d)for(var c=0;c<d;c++)a[a.length++]=b[c]}else a[a.length++]=
+b}}function gd(a,b){return Db(a,"$"+(b||"ngController")+"Controller")}function Db(a,b,d){9===a.nodeType&&(a=a.documentElement);for(b=H(b)?b:[b];a;){for(var c=0,e=b.length;c<e;c++)if(u(d=B.data(a,b[c])))return d;a=a.parentNode||11===a.nodeType&&a.host}}function hd(a){for(xb(a,!0);a.firstChild;)a.removeChild(a.firstChild)}function Eb(a,b){b||xb(a);var d=a.parentNode;d&&d.removeChild(a)}function fg(a,b){b=b||x;if("complete"===b.document.readyState)b.setTimeout(a);else B(b).on("load",a)}function ed(a){function b(){x.document.removeEventListener("DOMContentLoaded",
+b);x.removeEventListener("load",b);a()}"complete"===x.document.readyState?x.setTimeout(a):(x.document.addEventListener("DOMContentLoaded",b),x.addEventListener("load",b))}function id(a,b){var d=Fb[b.toLowerCase()];return d&&jd[wa(a)]&&d}function gg(a,b){var d=function(c,d){c.isDefaultPrevented=function(){return c.defaultPrevented};var f=b[d||c.type],g=f?f.length:0;if(g){if(w(c.immediatePropagationStopped)){var h=c.stopImmediatePropagation;c.stopImmediatePropagation=function(){c.immediatePropagationStopped=
+!0;c.stopPropagation&&c.stopPropagation();h&&h.call(c)}}c.isImmediatePropagationStopped=function(){return!0===c.immediatePropagationStopped};var k=f.specialHandlerWrapper||hg;1<g&&(f=pa(f));for(var l=0;l<g;l++)c.isImmediatePropagationStopped()||k(a,c,f[l])}};d.elem=a;return d}function hg(a,b,d){d.call(a,b)}function ig(a,b,d){var c=b.relatedTarget;c&&(c===a||jg.call(a,c))||d.call(a,b)}function Yf(){this.$get=function(){return S(W,{hasClass:function(a,b){a.attr&&(a=a[0]);return Ab(a,b)},addClass:function(a,
+b){a.attr&&(a=a[0]);return Cb(a,b)},removeClass:function(a,b){a.attr&&(a=a[0]);return Bb(a,b)}})}}function Pa(a,b){var d=a&&a.$$hashKey;if(d)return"function"===typeof d&&(d=a.$$hashKey()),d;d=typeof a;return d="function"===d||"object"===d&&null!==a?a.$$hashKey=d+":"+(b||ne)():d+":"+a}function kd(){this._keys=[];this._values=[];this._lastKey=NaN;this._lastIndex=-1}function ld(a){a=Function.prototype.toString.call(a).replace(kg,"");return a.match(lg)||a.match(mg)}function ng(a){return(a=ld(a))?"function("+
+(a[1]||"").replace(/[\s\r\n]+/," ")+")":"fn"}function eb(a,b){function d(a){return function(b,c){if(C(b))q(b,Lc(a));else return a(b,c)}}function c(a,b){Ka(a,"service");if(D(b)||H(b))b=p.instantiate(b);if(!b.$get)throw ya("pget",a);return n[a+"Provider"]=b}function e(a,b){return function(){var c=v.invoke(b,this);if(w(c))throw ya("undef",a);return c}}function f(a,b,d){return c(a,{$get:!1!==d?e(a,b):b})}function g(a){fb(w(a)||H(a),"modulesToLoad","not an array");var b=[],c;q(a,function(a){function d(a){var b,
+c;b=0;for(c=a.length;b<c;b++){var e=a[b],f=p.get(e[0]);f[e[1]].apply(f,e[2])}}if(!m.get(a)){m.set(a,!0);try{F(a)?(c=ac(a),v.modules[a]=c,b=b.concat(g(c.requires)).concat(c._runBlocks),d(c._invokeQueue),d(c._configBlocks)):D(a)?b.push(p.invoke(a)):H(a)?b.push(p.invoke(a)):sb(a,"module")}catch(e){throw H(a)&&(a=a[a.length-1]),e.message&&e.stack&&-1===e.stack.indexOf(e.message)&&(e=e.message+"\n"+e.stack),ya("modulerr",a,e.stack||e.message||e);}}});return b}function h(a,c){function d(b,e){if(a.hasOwnProperty(b)){if(a[b]===
+k)throw ya("cdep",b+" <- "+l.join(" <- "));return a[b]}try{return l.unshift(b),a[b]=k,a[b]=c(b,e),a[b]}catch(f){throw a[b]===k&&delete a[b],f;}finally{l.shift()}}function e(a,c,f){var g=[];a=eb.$$annotate(a,b,f);for(var k=0,h=a.length;k<h;k++){var l=a[k];if("string"!==typeof l)throw ya("itkn",l);g.push(c&&c.hasOwnProperty(l)?c[l]:d(l,f))}return g}return{invoke:function(a,b,c,d){"string"===typeof c&&(d=c,c=null);c=e(a,c,d);H(a)&&(a=a[a.length-1]);d=a;if(za||"function"!==typeof d)d=!1;else{var f=d.$$ngIsClass;
+Ha(f)||(f=d.$$ngIsClass=/^(?:class\b|constructor\()/.test(Function.prototype.toString.call(d)));d=f}return d?(c.unshift(null),new (Function.prototype.bind.apply(a,c))):a.apply(b,c)},instantiate:function(a,b,c){var d=H(a)?a[a.length-1]:a;a=e(a,b,c);a.unshift(null);return new (Function.prototype.bind.apply(d,a))},get:d,annotate:eb.$$annotate,has:function(b){return n.hasOwnProperty(b+"Provider")||a.hasOwnProperty(b)}}}b=!0===b;var k={},l=[],m=new Gb,n={$provide:{provider:d(c),factory:d(f),service:d(function(a,
+b){return f(a,["$injector",function(a){return a.instantiate(b)}])}),value:d(function(a,b){return f(a,la(b),!1)}),constant:d(function(a,b){Ka(a,"constant");n[a]=b;r[a]=b}),decorator:function(a,b){var c=p.get(a+"Provider"),d=c.$get;c.$get=function(){var a=v.invoke(d,c);return v.invoke(b,null,{$delegate:a})}}}},p=n.$injector=h(n,function(a,b){ea.isString(b)&&l.push(b);throw ya("unpr",l.join(" <- "));}),r={},J=h(r,function(a,b){var c=p.get(a+"Provider",b);return v.invoke(c.$get,c,void 0,a)}),v=J;n.$injectorProvider=
+{$get:la(J)};v.modules=p.modules=V();var t=g(a),v=J.get("$injector");v.strictDi=b;q(t,function(a){a&&v.invoke(a)});return v}function nf(){var a=!0;this.disableAutoScrolling=function(){a=!1};this.$get=["$window","$location","$rootScope",function(b,d,c){function e(a){var b=null;Array.prototype.some.call(a,function(a){if("a"===wa(a))return b=a,!0});return b}function f(a){if(a){a.scrollIntoView();var c;c=g.yOffset;D(c)?c=c():Ub(c)?(c=c[0],c="fixed"!==b.getComputedStyle(c).position?0:c.getBoundingClientRect().bottom):
+ba(c)||(c=0);c&&(a=a.getBoundingClientRect().top,b.scrollBy(0,a-c))}else b.scrollTo(0,0)}function g(a){a=F(a)?a:ba(a)?a.toString():d.hash();var b;a?(b=h.getElementById(a))?f(b):(b=e(h.getElementsByName(a)))?f(b):"top"===a&&f(null):f(null)}var h=b.document;a&&c.$watch(function(){return d.hash()},function(a,b){a===b&&""===a||fg(function(){c.$evalAsync(g)})});return g}]}function ib(a,b){if(!a&&!b)return"";if(!a)return b;if(!b)return a;H(a)&&(a=a.join(" "));H(b)&&(b=b.join(" "));return a+" "+b}function og(a){F(a)&&
+(a=a.split(" "));var b=V();q(a,function(a){a.length&&(b[a]=!0)});return b}function ia(a){return C(a)?a:{}}function pg(a,b,d,c){function e(a){try{a.apply(null,va.call(arguments,1))}finally{if(J--,0===J)for(;v.length;)try{v.pop()()}catch(b){d.error(b)}}}function f(){Oa=null;h()}function g(){t=I();t=w(t)?null:t;sa(t,G)&&(t=G);M=G=t}function h(){var a=M;g();if(N!==k.url()||a!==t)N=k.url(),M=t,q(K,function(a){a(k.url(),t)})}var k=this,l=a.location,m=a.history,n=a.setTimeout,p=a.clearTimeout,r={};k.isMock=
+!1;var J=0,v=[];k.$$completeOutstandingRequest=e;k.$$incOutstandingRequestCount=function(){J++};k.notifyWhenNoOutstandingRequests=function(a){0===J?a():v.push(a)};var t,M,N=l.href,A=b.find("base"),Oa=null,I=c.history?function(){try{return m.state}catch(a){}}:z;g();k.url=function(b,d,e){w(e)&&(e=null);l!==a.location&&(l=a.location);m!==a.history&&(m=a.history);if(b){var f=M===e;if(N===b&&(!c.history||f))return k;var h=N&&Aa(N)===Aa(b);N=b;M=e;!c.history||h&&f?(h||(Oa=b),d?l.replace(b):h?(d=l,e=b.indexOf("#"),
+e=-1===e?"":b.substr(e),d.hash=e):l.href=b,l.href!==b&&(Oa=b)):(m[d?"replaceState":"pushState"](e,"",b),g());Oa&&(Oa=b);return k}return Oa||l.href.replace(/%27/g,"'")};k.state=function(){return t};var K=[],E=!1,G=null;k.onUrlChange=function(b){if(!E){if(c.history)B(a).on("popstate",f);B(a).on("hashchange",f);E=!0}K.push(b);return b};k.$$applicationDestroyed=function(){B(a).off("hashchange popstate",f)};k.$$checkUrlChange=h;k.baseHref=function(){var a=A.attr("href");return a?a.replace(/^(https?:)?\/\/[^/]*/,
+""):""};k.defer=function(a,b){var c;J++;c=n(function(){delete r[c];e(a)},b||0);r[c]=!0;return c};k.defer.cancel=function(a){return r[a]?(delete r[a],p(a),e(z),!0):!1}}function uf(){this.$get=["$window","$log","$sniffer","$document",function(a,b,d,c){return new pg(a,c,b,d)}]}function vf(){this.$get=function(){function a(a,c){function e(a){a!==n&&(p?p===a&&(p=a.n):p=a,f(a.n,a.p),f(a,n),n=a,n.n=null)}function f(a,b){a!==b&&(a&&(a.p=b),b&&(b.n=a))}if(a in b)throw L("$cacheFactory")("iid",a);var g=0,h=
+S({},c,{id:a}),k=V(),l=c&&c.capacity||Number.MAX_VALUE,m=V(),n=null,p=null;return b[a]={put:function(a,b){if(!w(b)){if(l<Number.MAX_VALUE){var c=m[a]||(m[a]={key:a});e(c)}a in k||g++;k[a]=b;g>l&&this.remove(p.key);return b}},get:function(a){if(l<Number.MAX_VALUE){var b=m[a];if(!b)return;e(b)}return k[a]},remove:function(a){if(l<Number.MAX_VALUE){var b=m[a];if(!b)return;b===n&&(n=b.p);b===p&&(p=b.n);f(b.n,b.p);delete m[a]}a in k&&(delete k[a],g--)},removeAll:function(){k=V();g=0;m=V();n=p=null},destroy:function(){m=
+h=k=null;delete b[a]},info:function(){return S({},h,{size:g})}}}var b={};a.info=function(){var a={};q(b,function(b,e){a[e]=b.info()});return a};a.get=function(a){return b[a]};return a}}function Sf(){this.$get=["$cacheFactory",function(a){return a("templates")}]}function Wc(a,b){function d(a,b,c){var d=/^\s*([@&<]|=(\*?))(\??)\s*([\w$]*)\s*$/,e=V();q(a,function(a,f){if(a in n)e[f]=n[a];else{var g=a.match(d);if(!g)throw fa("iscp",b,f,a,c?"controller bindings definition":"isolate scope definition");
+e[f]={mode:g[1][0],collection:"*"===g[2],optional:"?"===g[3],attrName:g[4]||f};g[4]&&(n[a]=e[f])}});return e}function c(a){var b=a.charAt(0);if(!b||b!==Q(b))throw fa("baddir",a);if(a!==a.trim())throw fa("baddir",a);}function e(a){var b=a.require||a.controller&&a.name;!H(b)&&C(b)&&q(b,function(a,c){var d=a.match(l);a.substring(d[0].length)||(b[c]=d[0]+c)});return b}var f={},g=/^\s*directive:\s*([\w-]+)\s+(.*)$/,h=/(([\w-]+)(?::([^;]+))?;?)/,k=re("ngSrc,ngSrcset,src,srcset"),l=/^(?:(\^\^?)?(\?)?(\^\^?)?)?/,
+m=/^(on[a-z]+|formaction)$/,n=V();this.directive=function N(b,d){fb(b,"name");Ka(b,"directive");F(b)?(c(b),fb(d,"directiveFactory"),f.hasOwnProperty(b)||(f[b]=[],a.factory(b+"Directive",["$injector","$exceptionHandler",function(a,c){var d=[];q(f[b],function(f,g){try{var h=a.invoke(f);D(h)?h={compile:la(h)}:!h.compile&&h.link&&(h.compile=la(h.link));h.priority=h.priority||0;h.index=g;h.name=h.name||b;h.require=e(h);var k=h,l=h.restrict;if(l&&(!F(l)||!/[EACM]/.test(l)))throw fa("badrestrict",l,b);k.restrict=
+l||"EA";h.$$moduleName=f.$$moduleName;d.push(h)}catch(m){c(m)}});return d}])),f[b].push(d)):q(b,Lc(N));return this};this.component=function(a,b){function c(a){function e(b){return D(b)||H(b)?function(c,d){return a.invoke(b,this,{$element:c,$attrs:d})}:b}var f=b.template||b.templateUrl?b.template:"",g={controller:d,controllerAs:qg(b.controller)||b.controllerAs||"$ctrl",template:e(f),templateUrl:e(b.templateUrl),transclude:b.transclude,scope:{},bindToController:b.bindings||{},restrict:"E",require:b.require};
+q(b,function(a,b){"$"===b.charAt(0)&&(g[b]=a)});return g}var d=b.controller||function(){};q(b,function(a,b){"$"===b.charAt(0)&&(c[b]=a,D(d)&&(d[b]=a))});c.$inject=["$injector"];return this.directive(a,c)};this.aHrefSanitizationWhitelist=function(a){return u(a)?(b.aHrefSanitizationWhitelist(a),this):b.aHrefSanitizationWhitelist()};this.imgSrcSanitizationWhitelist=function(a){return u(a)?(b.imgSrcSanitizationWhitelist(a),this):b.imgSrcSanitizationWhitelist()};var p=!0;this.debugInfoEnabled=function(a){return u(a)?
+(p=a,this):p};var r=!1;this.preAssignBindingsEnabled=function(a){return u(a)?(r=a,this):r};var J=10;this.onChangesTtl=function(a){return arguments.length?(J=a,this):J};var v=!0;this.commentDirectivesEnabled=function(a){return arguments.length?(v=a,this):v};var t=!0;this.cssClassDirectivesEnabled=function(a){return arguments.length?(t=a,this):t};this.$get=["$injector","$interpolate","$exceptionHandler","$templateRequest","$parse","$controller","$rootScope","$sce","$animate","$$sanitizeUri",function(a,
+b,c,e,n,E,G,y,O,X){function P(){try{if(!--ya)throw ia=void 0,fa("infchng",J);G.$apply(function(){for(var a=[],b=0,c=ia.length;b<c;++b)try{ia[b]()}catch(d){a.push(d)}ia=void 0;if(a.length)throw a;})}finally{ya++}}function s(a,b){if(b){var c=Object.keys(b),d,e,f;d=0;for(e=c.length;d<e;d++)f=c[d],this[f]=b[f]}else this.$attr={};this.$$element=a}function R(a,b,c){ta.innerHTML="<span "+b+">";b=ta.firstChild.attributes;var d=b[0];b.removeNamedItem(d.name);d.value=c;a.attributes.setNamedItem(d)}function La(a,
+b){try{a.addClass(b)}catch(c){}}function ca(a,b,c,d,e){a instanceof B||(a=B(a));var f=Ma(a,b,a,c,d,e);ca.$$addScopeClass(a);var g=null;return function(b,c,d){if(!a)throw fa("multilink");fb(b,"scope");e&&e.needsNewScope&&(b=b.$parent.$new());d=d||{};var h=d.parentBoundTranscludeFn,k=d.transcludeControllers;d=d.futureParentElement;h&&h.$$boundTransclude&&(h=h.$$boundTransclude);g||(g=(d=d&&d[0])?"foreignobject"!==wa(d)&&ma.call(d).match(/SVG/)?"svg":"html":"html");d="html"!==g?B(ha(g,B("<div>").append(a).html())):
+c?Na.clone.call(a):a;if(k)for(var l in k)d.data("$"+l+"Controller",k[l].instance);ca.$$addScopeInfo(d,b);c&&c(d,b);f&&f(b,d,d,h);c||(a=f=null);return d}}function Ma(a,b,c,d,e,f){function g(a,c,d,e){var f,k,l,m,n,p,r;if(K)for(r=Array(c.length),m=0;m<h.length;m+=3)f=h[m],r[f]=c[f];else r=c;m=0;for(n=h.length;m<n;)k=r[h[m++]],c=h[m++],f=h[m++],c?(c.scope?(l=a.$new(),ca.$$addScopeInfo(B(k),l)):l=a,p=c.transcludeOnThisElement?ja(a,c.transclude,e):!c.templateOnThisElement&&e?e:!e&&b?ja(a,b):null,c(f,l,
+k,d,p)):f&&f(a,k.childNodes,void 0,e)}for(var h=[],k=H(a)||a instanceof B,l,m,n,p,K,r=0;r<a.length;r++){l=new s;11===za&&L(a,r,k);m=jc(a[r],[],l,0===r?d:void 0,e);(f=m.length?W(m,a[r],l,b,c,null,[],[],f):null)&&f.scope&&ca.$$addScopeClass(l.$$element);l=f&&f.terminal||!(n=a[r].childNodes)||!n.length?null:Ma(n,f?(f.transcludeOnThisElement||!f.templateOnThisElement)&&f.transclude:b);if(f||l)h.push(r,f,l),p=!0,K=K||f;f=null}return p?g:null}function L(a,b,c){var d=a[b],e=d.parentNode,f;if(d.nodeType===
+Ia)for(;;){f=e?d.nextSibling:a[b+1];if(!f||f.nodeType!==Ia)break;d.nodeValue+=f.nodeValue;f.parentNode&&f.parentNode.removeChild(f);c&&f===a[b+1]&&a.splice(b+1,1)}}function ja(a,b,c){function d(e,f,g,h,k){e||(e=a.$new(!1,k),e.$$transcluded=!0);return b(e,f,{parentBoundTranscludeFn:c,transcludeControllers:g,futureParentElement:h})}var e=d.$$slots=V(),f;for(f in b.$$slots)e[f]=b.$$slots[f]?ja(a,b.$$slots[f],c):null;return d}function jc(a,b,c,d,e){var f=c.$attr,g;switch(a.nodeType){case 1:g=wa(a);Y(b,
+Ba(g),"E",d,e);for(var k,l,m,n,p=a.attributes,K=0,r=p&&p.length;K<r;K++){var G=!1,E=!1;k=p[K];l=k.name;m=k.value;k=Ba(l);(n=Ja.test(k))&&(l=l.replace(md,"").substr(8).replace(/_(.)/g,function(a,b){return b.toUpperCase()}));(k=k.match(Ka))&&Z(k[1])&&(G=l,E=l.substr(0,l.length-5)+"end",l=l.substr(0,l.length-6));k=Ba(l.toLowerCase());f[k]=l;if(n||!c.hasOwnProperty(k))c[k]=m,id(a,k)&&(c[k]=!0);pa(a,b,m,k,n);Y(b,k,"A",d,e,G,E)}"input"===g&&"hidden"===a.getAttribute("type")&&a.setAttribute("autocomplete",
+"off");if(!Ga)break;f=a.className;C(f)&&(f=f.animVal);if(F(f)&&""!==f)for(;a=h.exec(f);)k=Ba(a[2]),Y(b,k,"C",d,e)&&(c[k]=T(a[3])),f=f.substr(a.index+a[0].length);break;case Ia:la(b,a.nodeValue);break;case 8:if(!Fa)break;jb(a,b,c,d,e)}b.sort(ea);return b}function jb(a,b,c,d,e){try{var f=g.exec(a.nodeValue);if(f){var h=Ba(f[1]);Y(b,h,"M",d,e)&&(c[h]=T(f[2]))}}catch(k){}}function nd(a,b,c){var d=[],e=0;if(b&&a.hasAttribute&&a.hasAttribute(b)){do{if(!a)throw fa("uterdir",b,c);1===a.nodeType&&(a.hasAttribute(b)&&
+e++,a.hasAttribute(c)&&e--);d.push(a);a=a.nextSibling}while(0<e)}else d.push(a);return B(d)}function od(a,b,c){return function(d,e,f,g,h){e=nd(e[0],b,c);return a(d,e,f,g,h)}}function kc(a,b,c,d,e,f){var g;return a?ca(b,c,d,e,f):function(){g||(g=ca(b,c,d,e,f),b=c=f=null);return g.apply(this,arguments)}}function W(a,b,d,e,f,g,h,k,l){function m(a,b,c,d){if(a){c&&(a=od(a,c,d));a.require=y.require;a.directiveName=P;if(E===y||y.$$isolateScope)a=qa(a,{isolateScope:!0});h.push(a)}if(b){c&&(b=od(b,c,d));b.require=
+y.require;b.directiveName=P;if(E===y||y.$$isolateScope)b=qa(b,{isolateScope:!0});k.push(b)}}function n(a,e,f,g,l){function m(a,b,c,d){var e;Za(a)||(d=c,c=b,b=a,a=void 0);X&&(e=O);c||(c=X?P.parent():P);if(d){var f=l.$$slots[d];if(f)return f(a,b,e,c,R);if(w(f))throw fa("noslot",d,xa(P));}else return l(a,b,e,c,R)}var p,y,t,v,J,O,N,P;b===f?(g=d,P=d.$$element):(P=B(f),g=new s(P,d));J=e;E?v=e.$new(!0):K&&(J=e.$parent);l&&(N=m,N.$$boundTransclude=l,N.isSlotFilled=function(a){return!!l.$$slots[a]});G&&(O=
+ba(P,g,N,G,v,e,E));E&&(ca.$$addScopeInfo(P,v,!0,!(I&&(I===E||I===E.$$originalDirective))),ca.$$addScopeClass(P,!0),v.$$isolateBindings=E.$$isolateBindings,y=na(e,g,v,v.$$isolateBindings,E),y.removeWatches&&v.$on("$destroy",y.removeWatches));for(p in O){y=G[p];t=O[p];var Hb=y.$$bindings.bindToController;if(r){t.bindingInfo=Hb?na(J,g,t.instance,Hb,y):{};var A=t();A!==t.instance&&(t.instance=A,P.data("$"+y.name+"Controller",A),t.bindingInfo.removeWatches&&t.bindingInfo.removeWatches(),t.bindingInfo=
+na(J,g,t.instance,Hb,y))}else t.instance=t(),P.data("$"+y.name+"Controller",t.instance),t.bindingInfo=na(J,g,t.instance,Hb,y)}q(G,function(a,b){var c=a.require;a.bindToController&&!H(c)&&C(c)&&S(O[b].instance,U(b,c,P,O))});q(O,function(a){var b=a.instance;if(D(b.$onChanges))try{b.$onChanges(a.bindingInfo.initialChanges)}catch(d){c(d)}if(D(b.$onInit))try{b.$onInit()}catch(e){c(e)}D(b.$doCheck)&&(J.$watch(function(){b.$doCheck()}),b.$doCheck());D(b.$onDestroy)&&J.$on("$destroy",function(){b.$onDestroy()})});
+p=0;for(y=h.length;p<y;p++)t=h[p],ra(t,t.isolateScope?v:e,P,g,t.require&&U(t.directiveName,t.require,P,O),N);var R=e;E&&(E.template||null===E.templateUrl)&&(R=v);a&&a(R,f.childNodes,void 0,l);for(p=k.length-1;0<=p;p--)t=k[p],ra(t,t.isolateScope?v:e,P,g,t.require&&U(t.directiveName,t.require,P,O),N);q(O,function(a){a=a.instance;D(a.$postLink)&&a.$postLink()})}l=l||{};for(var p=-Number.MAX_VALUE,K=l.newScopeDirective,G=l.controllerDirectives,E=l.newIsolateScopeDirective,I=l.templateDirective,t=l.nonTlbTranscludeDirective,
+J=!1,O=!1,X=l.hasElementTranscludeDirective,v=d.$$element=B(b),y,P,N,A=e,R,u=!1,La=!1,x,z=0,F=a.length;z<F;z++){y=a[z];var Ma=y.$$start,L=y.$$end;Ma&&(v=nd(b,Ma,L));N=void 0;if(p>y.priority)break;if(x=y.scope)y.templateUrl||(C(x)?($("new/isolated scope",E||K,y,v),E=y):$("new/isolated scope",E,y,v)),K=K||y;P=y.name;if(!u&&(y.replace&&(y.templateUrl||y.template)||y.transclude&&!y.$$tlb)){for(x=z+1;u=a[x++];)if(u.transclude&&!u.$$tlb||u.replace&&(u.templateUrl||u.template)){La=!0;break}u=!0}!y.templateUrl&&
+y.controller&&(G=G||V(),$("'"+P+"' controller",G[P],y,v),G[P]=y);if(x=y.transclude)if(J=!0,y.$$tlb||($("transclusion",t,y,v),t=y),"element"===x)X=!0,p=y.priority,N=v,v=d.$$element=B(ca.$$createComment(P,d[P])),b=v[0],ka(f,va.call(N,0),b),N[0].$$parentNode=N[0].parentNode,A=kc(La,N,e,p,g&&g.name,{nonTlbTranscludeDirective:t});else{var ja=V();if(C(x)){N=[];var Q=V(),jb=V();q(x,function(a,b){var c="?"===a.charAt(0);a=c?a.substring(1):a;Q[a]=b;ja[b]=null;jb[b]=c});q(v.contents(),function(a){var b=Q[Ba(wa(a))];
+b?(jb[b]=!0,ja[b]=ja[b]||[],ja[b].push(a)):N.push(a)});q(jb,function(a,b){if(!a)throw fa("reqslot",b);});for(var ic in ja)ja[ic]&&(ja[ic]=kc(La,ja[ic],e))}else N=B(fc(b)).contents();v.empty();A=kc(La,N,e,void 0,void 0,{needsNewScope:y.$$isolateScope||y.$$newScope});A.$$slots=ja}if(y.template)if(O=!0,$("template",I,y,v),I=y,x=D(y.template)?y.template(v,d):y.template,x=Ea(x),y.replace){g=y;N=cc.test(x)?pd(ha(y.templateNamespace,T(x))):[];b=N[0];if(1!==N.length||1!==b.nodeType)throw fa("tplrt",P,"");
+ka(f,v,b);F={$attr:{}};x=jc(b,[],F);var Y=a.splice(z+1,a.length-(z+1));(E||K)&&aa(x,E,K);a=a.concat(x).concat(Y);da(d,F);F=a.length}else v.html(x);if(y.templateUrl)O=!0,$("template",I,y,v),I=y,y.replace&&(g=y),n=ga(a.splice(z,a.length-z),v,d,f,J&&A,h,k,{controllerDirectives:G,newScopeDirective:K!==y&&K,newIsolateScopeDirective:E,templateDirective:I,nonTlbTranscludeDirective:t}),F=a.length;else if(y.compile)try{R=y.compile(v,d,A);var Z=y.$$originalDirective||y;D(R)?m(null,bb(Z,R),Ma,L):R&&m(bb(Z,R.pre),
+bb(Z,R.post),Ma,L)}catch(ea){c(ea,xa(v))}y.terminal&&(n.terminal=!0,p=Math.max(p,y.priority))}n.scope=K&&!0===K.scope;n.transcludeOnThisElement=J;n.templateOnThisElement=O;n.transclude=A;l.hasElementTranscludeDirective=X;return n}function U(a,b,c,d){var e;if(F(b)){var f=b.match(l);b=b.substring(f[0].length);var g=f[1]||f[3],f="?"===f[2];"^^"===g?c=c.parent():e=(e=d&&d[b])&&e.instance;if(!e){var h="$"+b+"Controller";e=g?c.inheritedData(h):c.data(h)}if(!e&&!f)throw fa("ctreq",b,a);}else if(H(b))for(e=
+[],g=0,f=b.length;g<f;g++)e[g]=U(a,b[g],c,d);else C(b)&&(e={},q(b,function(b,f){e[f]=U(a,b,c,d)}));return e||null}function ba(a,b,c,d,e,f,g){var h=V(),k;for(k in d){var l=d[k],m={$scope:l===g||l.$$isolateScope?e:f,$element:a,$attrs:b,$transclude:c},n=l.controller;"@"===n&&(n=b[l.name]);m=E(n,m,!0,l.controllerAs);h[l.name]=m;a.data("$"+l.name+"Controller",m.instance)}return h}function aa(a,b,c){for(var d=0,e=a.length;d<e;d++)a[d]=Vb(a[d],{$$isolateScope:b,$$newScope:c})}function Y(b,c,e,g,h,k,l){if(c===
+h)return null;var m=null;if(f.hasOwnProperty(c)){h=a.get(c+"Directive");for(var n=0,p=h.length;n<p;n++)if(c=h[n],(w(g)||g>c.priority)&&-1!==c.restrict.indexOf(e)){k&&(c=Vb(c,{$$start:k,$$end:l}));if(!c.$$bindings){var K=m=c,r=c.name,t={isolateScope:null,bindToController:null};C(K.scope)&&(!0===K.bindToController?(t.bindToController=d(K.scope,r,!0),t.isolateScope={}):t.isolateScope=d(K.scope,r,!1));C(K.bindToController)&&(t.bindToController=d(K.bindToController,r,!0));if(t.bindToController&&!K.controller)throw fa("noctrl",
+r);m=m.$$bindings=t;C(m.isolateScope)&&(c.$$isolateBindings=m.isolateScope)}b.push(c);m=c}}return m}function Z(b){if(f.hasOwnProperty(b))for(var c=a.get(b+"Directive"),d=0,e=c.length;d<e;d++)if(b=c[d],b.multiElement)return!0;return!1}function da(a,b){var c=b.$attr,d=a.$attr;q(a,function(d,e){"$"!==e.charAt(0)&&(b[e]&&b[e]!==d&&(d=d.length?d+(("style"===e?";":" ")+b[e]):b[e]),a.$set(e,d,!0,c[e]))});q(b,function(b,e){a.hasOwnProperty(e)||"$"===e.charAt(0)||(a[e]=b,"class"!==e&&"style"!==e&&(d[e]=c[e]))})}
+function ga(a,b,d,f,g,h,k,l){var m=[],n,p,K=b[0],r=a.shift(),t=Vb(r,{templateUrl:null,transclude:null,replace:null,$$originalDirective:r}),y=D(r.templateUrl)?r.templateUrl(b,d):r.templateUrl,E=r.templateNamespace;b.empty();e(y).then(function(c){var e,G;c=Ea(c);if(r.replace){c=cc.test(c)?pd(ha(E,T(c))):[];e=c[0];if(1!==c.length||1!==e.nodeType)throw fa("tplrt",r.name,y);c={$attr:{}};ka(f,b,e);var I=jc(e,[],c);C(r.scope)&&aa(I,!0);a=I.concat(a);da(d,c)}else e=K,b.html(c);a.unshift(t);n=W(a,e,d,g,b,
+r,h,k,l);q(f,function(a,c){a===e&&(f[c]=b[0])});for(p=Ma(b[0].childNodes,g);m.length;){c=m.shift();G=m.shift();var v=m.shift(),J=m.shift(),I=b[0];if(!c.$$destroyed){if(G!==K){var O=G.className;l.hasElementTranscludeDirective&&r.replace||(I=fc(e));ka(v,B(G),I);La(B(I),O)}G=n.transcludeOnThisElement?ja(c,n.transclude,J):J;n(p,c,I,f,G)}}m=null}).catch(function(a){a instanceof Error&&c(a)});return function(a,b,c,d,e){a=e;b.$$destroyed||(m?m.push(b,c,d,a):(n.transcludeOnThisElement&&(a=ja(b,n.transclude,
+e)),n(p,b,c,d,a)))}}function ea(a,b){var c=b.priority-a.priority;return 0!==c?c:a.name!==b.name?a.name<b.name?-1:1:a.index-b.index}function $(a,b,c,d){function e(a){return a?" (module: "+a+")":""}if(b)throw fa("multidir",b.name,e(b.$$moduleName),c.name,e(c.$$moduleName),a,xa(d));}function la(a,c){var d=b(c,!0);d&&a.push({priority:0,compile:function(a){a=a.parent();var b=!!a.length;b&&ca.$$addBindingClass(a);return function(a,c){var e=c.parent();b||ca.$$addBindingClass(e);ca.$$addBindingInfo(e,d.expressions);
+a.$watch(d,function(a){c[0].nodeValue=a})}}})}function ha(a,b){a=Q(a||"html");switch(a){case "svg":case "math":var c=x.document.createElement("div");c.innerHTML="<"+a+">"+b+"</"+a+">";return c.childNodes[0].childNodes;default:return b}}function oa(a,b){if("srcdoc"===b)return y.HTML;var c=wa(a);if("src"===b||"ngSrc"===b){if(-1===["img","video","audio","source","track"].indexOf(c))return y.RESOURCE_URL}else if("xlinkHref"===b||"form"===c&&"action"===b||"link"===c&&"href"===b)return y.RESOURCE_URL}function pa(a,
+c,d,e,f){var g=oa(a,e),h=k[e]||f,l=b(d,!f,g,h);if(l){if("multiple"===e&&"select"===wa(a))throw fa("selmulti",xa(a));if(m.test(e))throw fa("nodomevents");c.push({priority:100,compile:function(){return{pre:function(a,c,f){c=f.$$observers||(f.$$observers=V());var k=f[e];k!==d&&(l=k&&b(k,!0,g,h),d=k);l&&(f[e]=l(a),(c[e]||(c[e]=[])).$$inter=!0,(f.$$observers&&f.$$observers[e].$$scope||a).$watch(l,function(a,b){"class"===e&&a!==b?f.$updateClass(a,b):f.$set(e,a)}))}}}})}}function ka(a,b,c){var d=b[0],e=
+b.length,f=d.parentNode,g,h;if(a)for(g=0,h=a.length;g<h;g++)if(a[g]===d){a[g++]=c;h=g+e-1;for(var k=a.length;g<k;g++,h++)h<k?a[g]=a[h]:delete a[g];a.length-=e-1;a.context===d&&(a.context=c);break}f&&f.replaceChild(c,d);a=x.document.createDocumentFragment();for(g=0;g<e;g++)a.appendChild(b[g]);B.hasData(d)&&(B.data(c,B.data(d)),B(d).off("$destroy"));B.cleanData(a.querySelectorAll("*"));for(g=1;g<e;g++)delete b[g];b[0]=c;b.length=1}function qa(a,b){return S(function(){return a.apply(null,arguments)},
+a,b)}function ra(a,b,d,e,f,g){try{a(b,d,e,f,g)}catch(h){c(h,xa(d))}}function na(a,c,d,e,f){function g(b,c,e){D(d.$onChanges)&&!Xb(c,e)&&(ia||(a.$$postDigest(P),ia=[]),m||(m={},ia.push(h)),m[b]&&(e=m[b].previousValue),m[b]=new Ib(e,c))}function h(){d.$onChanges(m);m=void 0}var k=[],l={},m;q(e,function(e,h){var m=e.attrName,p=e.optional,r,t,y,G;switch(e.mode){case "@":p||ua.call(c,m)||(d[h]=c[m]=void 0);p=c.$observe(m,function(a){if(F(a)||Ha(a))g(h,a,d[h]),d[h]=a});c.$$observers[m].$$scope=a;r=c[m];
+F(r)?d[h]=b(r)(a):Ha(r)&&(d[h]=r);l[h]=new Ib(lc,d[h]);k.push(p);break;case "=":if(!ua.call(c,m)){if(p)break;c[m]=void 0}if(p&&!c[m])break;t=n(c[m]);G=t.literal?sa:Xb;y=t.assign||function(){r=d[h]=t(a);throw fa("nonassign",c[m],m,f.name);};r=d[h]=t(a);p=function(b){G(b,d[h])||(G(b,r)?y(a,b=d[h]):d[h]=b);return r=b};p.$stateful=!0;p=e.collection?a.$watchCollection(c[m],p):a.$watch(n(c[m],p),null,t.literal);k.push(p);break;case "<":if(!ua.call(c,m)){if(p)break;c[m]=void 0}if(p&&!c[m])break;t=n(c[m]);
+var E=t.literal,I=d[h]=t(a);l[h]=new Ib(lc,d[h]);p=a.$watch(t,function(a,b){if(b===a){if(b===I||E&&sa(b,I))return;b=I}g(h,a,b);d[h]=a},E);k.push(p);break;case "&":t=c.hasOwnProperty(m)?n(c[m]):z;if(t===z&&p)break;d[h]=function(b){return t(a,b)}}});return{initialChanges:l,removeWatches:k.length&&function(){for(var a=0,b=k.length;a<b;++a)k[a]()}}}var Ca=/^\w/,ta=x.document.createElement("div"),Fa=v,Ga=t,ya=J,ia;s.prototype={$normalize:Ba,$addClass:function(a){a&&0<a.length&&O.addClass(this.$$element,
+a)},$removeClass:function(a){a&&0<a.length&&O.removeClass(this.$$element,a)},$updateClass:function(a,b){var c=qd(a,b);c&&c.length&&O.addClass(this.$$element,c);(c=qd(b,a))&&c.length&&O.removeClass(this.$$element,c)},$set:function(a,b,d,e){var f=id(this.$$element[0],a),g=rd[a],h=a;f?(this.$$element.prop(a,b),e=f):g&&(this[g]=b,h=g);this[a]=b;e?this.$attr[a]=e:(e=this.$attr[a])||(this.$attr[a]=e=Tc(a,"-"));f=wa(this.$$element);if("a"===f&&("href"===a||"xlinkHref"===a)||"img"===f&&"src"===a)this[a]=
+b=X(b,"src"===a);else if("img"===f&&"srcset"===a&&u(b)){for(var f="",g=T(b),k=/(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/,k=/\s/.test(g)?k:/(,)/,g=g.split(k),k=Math.floor(g.length/2),l=0;l<k;l++)var m=2*l,f=f+X(T(g[m]),!0),f=f+(" "+T(g[m+1]));g=T(g[2*l]).split(/\s/);f+=X(T(g[0]),!0);2===g.length&&(f+=" "+T(g[1]));this[a]=b=f}!1!==d&&(null===b||w(b)?this.$$element.removeAttr(e):Ca.test(e)?this.$$element.attr(e,b):R(this.$$element[0],e,b));(a=this.$$observers)&&q(a[h],function(a){try{a(b)}catch(d){c(d)}})},
+$observe:function(a,b){var c=this,d=c.$$observers||(c.$$observers=V()),e=d[a]||(d[a]=[]);e.push(b);G.$evalAsync(function(){e.$$inter||!c.hasOwnProperty(a)||w(c[a])||b(c[a])});return function(){$a(e,b)}}};var Aa=b.startSymbol(),Da=b.endSymbol(),Ea="{{"===Aa&&"}}"===Da?Ya:function(a){return a.replace(/\{\{/g,Aa).replace(/}}/g,Da)},Ja=/^ngAttr[A-Z]/,Ka=/^(.+)Start$/;ca.$$addBindingInfo=p?function(a,b){var c=a.data("$binding")||[];H(b)?c=c.concat(b):c.push(b);a.data("$binding",c)}:z;ca.$$addBindingClass=
+p?function(a){La(a,"ng-binding")}:z;ca.$$addScopeInfo=p?function(a,b,c,d){a.data(c?d?"$isolateScopeNoTemplate":"$isolateScope":"$scope",b)}:z;ca.$$addScopeClass=p?function(a,b){La(a,b?"ng-isolate-scope":"ng-scope")}:z;ca.$$createComment=function(a,b){var c="";p&&(c=" "+(a||"")+": ",b&&(c+=b+" "));return x.document.createComment(c)};return ca}]}function Ib(a,b){this.previousValue=a;this.currentValue=b}function Ba(a){return a.replace(md,"").replace(rg,gb)}function qd(a,b){var d="",c=a.split(/\s+/),
+e=b.split(/\s+/),f=0;a:for(;f<c.length;f++){for(var g=c[f],h=0;h<e.length;h++)if(g===e[h])continue a;d+=(0<d.length?" ":"")+g}return d}function pd(a){a=B(a);var b=a.length;if(1>=b)return a;for(;b--;){var d=a[b];(8===d.nodeType||d.nodeType===Ia&&""===d.nodeValue.trim())&&sg.call(a,b,1)}return a}function qg(a,b){if(b&&F(b))return b;if(F(a)){var d=sd.exec(a);if(d)return d[3]}}function wf(){var a={},b=!1;this.has=function(b){return a.hasOwnProperty(b)};this.register=function(b,c){Ka(b,"controller");C(b)?
+S(a,b):a[b]=c};this.allowGlobals=function(){b=!0};this.$get=["$injector","$window",function(d,c){function e(a,b,c,d){if(!a||!C(a.$scope))throw L("$controller")("noscp",d,b);a.$scope[b]=c}return function(f,g,h,k){var l,m,n;h=!0===h;k&&F(k)&&(n=k);if(F(f)){k=f.match(sd);if(!k)throw td("ctrlfmt",f);m=k[1];n=n||k[3];f=a.hasOwnProperty(m)?a[m]:Vc(g.$scope,m,!0)||(b?Vc(c,m,!0):void 0);if(!f)throw td("ctrlreg",m);sb(f,m,!0)}if(h)return h=(H(f)?f[f.length-1]:f).prototype,l=Object.create(h||null),n&&e(g,n,
+l,m||f.name),S(function(){var a=d.invoke(f,l,g,m);a!==l&&(C(a)||D(a))&&(l=a,n&&e(g,n,l,m||f.name));return l},{instance:l,identifier:n});l=d.instantiate(f,g,m);n&&e(g,n,l,m||f.name);return l}}]}function xf(){this.$get=["$window",function(a){return B(a.document)}]}function yf(){this.$get=["$document","$rootScope",function(a,b){function d(){e=c.hidden}var c=a[0],e=c&&c.hidden;a.on("visibilitychange",d);b.$on("$destroy",function(){a.off("visibilitychange",d)});return function(){return e}}]}function zf(){this.$get=
+["$log",function(a){return function(b,d){a.error.apply(a,arguments)}}]}function mc(a){return C(a)?ga(a)?a.toISOString():cb(a):a}function Ef(){this.$get=function(){return function(a){if(!a)return"";var b=[];Kc(a,function(a,c){null===a||w(a)||(H(a)?q(a,function(a){b.push($(c)+"="+$(mc(a)))}):b.push($(c)+"="+$(mc(a))))});return b.join("&")}}}function Ff(){this.$get=function(){return function(a){function b(a,e,f){null===a||w(a)||(H(a)?q(a,function(a,c){b(a,e+"["+(C(a)?c:"")+"]")}):C(a)&&!ga(a)?Kc(a,function(a,
+c){b(a,e+(f?"":"[")+c+(f?"":"]"))}):d.push($(e)+"="+$(mc(a))))}if(!a)return"";var d=[];b(a,"",!0);return d.join("&")}}}function nc(a,b){if(F(a)){var d=a.replace(tg,"").trim();if(d){var c=b("Content-Type");(c=c&&0===c.indexOf(ud))||(c=(c=d.match(ug))&&vg[c[0]].test(d));if(c)try{a=Oc(d)}catch(e){throw oc("baddata",a,e);}}}return a}function vd(a){var b=V(),d;F(a)?q(a.split("\n"),function(a){d=a.indexOf(":");var e=Q(T(a.substr(0,d)));a=T(a.substr(d+1));e&&(b[e]=b[e]?b[e]+", "+a:a)}):C(a)&&q(a,function(a,
+d){var f=Q(d),g=T(a);f&&(b[f]=b[f]?b[f]+", "+g:g)});return b}function wd(a){var b;return function(d){b||(b=vd(a));return d?(d=b[Q(d)],void 0===d&&(d=null),d):b}}function xd(a,b,d,c){if(D(c))return c(a,b,d);q(c,function(c){a=c(a,b,d)});return a}function Df(){var a=this.defaults={transformResponse:[nc],transformRequest:[function(a){return C(a)&&"[object File]"!==ma.call(a)&&"[object Blob]"!==ma.call(a)&&"[object FormData]"!==ma.call(a)?cb(a):a}],headers:{common:{Accept:"application/json, text/plain, */*"},
+post:pa(pc),put:pa(pc),patch:pa(pc)},xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",paramSerializer:"$httpParamSerializer",jsonpCallbackParam:"callback"},b=!1;this.useApplyAsync=function(a){return u(a)?(b=!!a,this):b};var d=this.interceptors=[];this.$get=["$browser","$httpBackend","$$cookieReader","$cacheFactory","$rootScope","$q","$injector","$sce",function(c,e,f,g,h,k,l,m){function n(b){function d(a,b){for(var c=0,e=b.length;c<e;){var f=b[c++],g=b[c++];a=a.then(f,g)}b.length=0;return a}
+function e(a,b){var c,d={};q(a,function(a,e){D(a)?(c=a(b),null!=c&&(d[e]=c)):d[e]=a});return d}function f(a){var b=S({},a);b.data=xd(a.data,a.headers,a.status,g.transformResponse);a=a.status;return 200<=a&&300>a?b:k.reject(b)}if(!C(b))throw L("$http")("badreq",b);if(!F(m.valueOf(b.url)))throw L("$http")("badreq",b.url);var g=S({method:"get",transformRequest:a.transformRequest,transformResponse:a.transformResponse,paramSerializer:a.paramSerializer,jsonpCallbackParam:a.jsonpCallbackParam},b);g.headers=
+function(b){var c=a.headers,d=S({},b.headers),f,g,h,c=S({},c.common,c[Q(b.method)]);a:for(f in c){g=Q(f);for(h in d)if(Q(h)===g)continue a;d[f]=c[f]}return e(d,pa(b))}(b);g.method=ub(g.method);g.paramSerializer=F(g.paramSerializer)?l.get(g.paramSerializer):g.paramSerializer;c.$$incOutstandingRequestCount();var h=[],n=[];b=k.resolve(g);q(t,function(a){(a.request||a.requestError)&&h.unshift(a.request,a.requestError);(a.response||a.responseError)&&n.push(a.response,a.responseError)});b=d(b,h);b=b.then(function(b){var c=
+b.headers,d=xd(b.data,wd(c),void 0,b.transformRequest);w(d)&&q(c,function(a,b){"content-type"===Q(b)&&delete c[b]});w(b.withCredentials)&&!w(a.withCredentials)&&(b.withCredentials=a.withCredentials);return p(b,d).then(f,f)});b=d(b,n);return b=b.finally(function(){c.$$completeOutstandingRequest(z)})}function p(c,d){function g(a){if(a){var c={};q(a,function(a,d){c[d]=function(c){function d(){a(c)}b?h.$applyAsync(d):h.$$phase?d():h.$apply(d)}});return c}}function l(a,c,d,e){function f(){p(c,a,d,e)}O&&
+(200<=a&&300>a?O.put(R,[a,c,vd(d),e]):O.remove(R));b?h.$applyAsync(f):(f(),h.$$phase||h.$apply())}function p(a,b,d,e){b=-1<=b?b:0;(200<=b&&300>b?G.resolve:G.reject)({data:a,status:b,headers:wd(d),config:c,statusText:e})}function K(a){p(a.data,a.status,pa(a.headers()),a.statusText)}function t(){var a=n.pendingRequests.indexOf(c);-1!==a&&n.pendingRequests.splice(a,1)}var G=k.defer(),y=G.promise,O,X,P=c.headers,s="jsonp"===Q(c.method),R=c.url;s?R=m.getTrustedResourceUrl(R):F(R)||(R=m.valueOf(R));R=r(R,
+c.paramSerializer(c.params));s&&(R=J(R,c.jsonpCallbackParam));n.pendingRequests.push(c);y.then(t,t);!c.cache&&!a.cache||!1===c.cache||"GET"!==c.method&&"JSONP"!==c.method||(O=C(c.cache)?c.cache:C(a.cache)?a.cache:v);O&&(X=O.get(R),u(X)?X&&D(X.then)?X.then(K,K):H(X)?p(X[1],X[0],pa(X[2]),X[3]):p(X,200,{},"OK"):O.put(R,y));w(X)&&((X=yd(c.url)?f()[c.xsrfCookieName||a.xsrfCookieName]:void 0)&&(P[c.xsrfHeaderName||a.xsrfHeaderName]=X),e(c.method,R,d,l,P,c.timeout,c.withCredentials,c.responseType,g(c.eventHandlers),
+g(c.uploadEventHandlers)));return y}function r(a,b){0<b.length&&(a+=(-1===a.indexOf("?")?"?":"&")+b);return a}function J(a,b){if(/[&?][^=]+=JSON_CALLBACK/.test(a))throw oc("badjsonp",a);if((new RegExp("[&?]"+b+"=")).test(a))throw oc("badjsonp",b,a);return a+=(-1===a.indexOf("?")?"?":"&")+b+"=JSON_CALLBACK"}var v=g("$http");a.paramSerializer=F(a.paramSerializer)?l.get(a.paramSerializer):a.paramSerializer;var t=[];q(d,function(a){t.unshift(F(a)?l.get(a):l.invoke(a))});n.pendingRequests=[];(function(a){q(arguments,
+function(a){n[a]=function(b,c){return n(S({},c||{},{method:a,url:b}))}})})("get","delete","head","jsonp");(function(a){q(arguments,function(a){n[a]=function(b,c,d){return n(S({},d||{},{method:a,url:b,data:c}))}})})("post","put","patch");n.defaults=a;return n}]}function Hf(){this.$get=function(){return function(){return new x.XMLHttpRequest}}}function Gf(){this.$get=["$browser","$jsonpCallbacks","$document","$xhrFactory",function(a,b,d,c){return wg(a,c,a.defer,b,d[0])}]}function wg(a,b,d,c,e){function f(a,
+b,d){a=a.replace("JSON_CALLBACK",b);var f=e.createElement("script"),m=null;f.type="text/javascript";f.src=a;f.async=!0;m=function(a){f.removeEventListener("load",m);f.removeEventListener("error",m);e.body.removeChild(f);f=null;var g=-1,r="unknown";a&&("load"!==a.type||c.wasCalled(b)||(a={type:"error"}),r=a.type,g="error"===a.type?404:200);d&&d(g,r)};f.addEventListener("load",m);f.addEventListener("error",m);e.body.appendChild(f);return m}return function(e,h,k,l,m,n,p,r,J,v){function t(){N&&N();A&&
+A.abort()}h=h||a.url();if("jsonp"===Q(e))var M=c.createCallback(h),N=f(h,M,function(a,b){var e=200===a&&c.getResponse(M);u(I)&&d.cancel(I);N=A=null;l(a,e,"",b);c.removeCallback(M)});else{var A=b(e,h);A.open(e,h,!0);q(m,function(a,b){u(a)&&A.setRequestHeader(b,a)});A.onload=function(){var a=A.statusText||"",b="response"in A?A.response:A.responseText,c=1223===A.status?204:A.status;0===c&&(c=b?200:"file"===Ca(h).protocol?404:0);var e=A.getAllResponseHeaders();u(I)&&d.cancel(I);N=A=null;l(c,b,e,a)};e=
+function(){u(I)&&d.cancel(I);N=A=null;l(-1,null,null,"")};A.onerror=e;A.onabort=e;A.ontimeout=e;q(J,function(a,b){A.addEventListener(b,a)});q(v,function(a,b){A.upload.addEventListener(b,a)});p&&(A.withCredentials=!0);if(r)try{A.responseType=r}catch(s){if("json"!==r)throw s;}A.send(w(k)?null:k)}if(0<n)var I=d(t,n);else n&&D(n.then)&&n.then(t)}}function Bf(){var a="{{",b="}}";this.startSymbol=function(b){return b?(a=b,this):a};this.endSymbol=function(a){return a?(b=a,this):b};this.$get=["$parse","$exceptionHandler",
+"$sce",function(d,c,e){function f(a){return"\\\\\\"+a}function g(c){return c.replace(n,a).replace(p,b)}function h(a,b,c,d){var e=a.$watch(function(a){e();return d(a)},b,c);return e}function k(f,k,n,p){function M(a){try{var b=a;a=n?e.getTrusted(n,b):e.valueOf(b);return p&&!u(a)?a:$b(a)}catch(d){c(Da.interr(f,d))}}if(!f.length||-1===f.indexOf(a)){var q;k||(k=g(f),q=la(k),q.exp=f,q.expressions=[],q.$$watchDelegate=h);return q}p=!!p;var A,s,I=0,K=[],E=[];q=f.length;for(var G=[],y=[];I<q;)if(-1!==(A=f.indexOf(a,
+I))&&-1!==(s=f.indexOf(b,A+l)))I!==A&&G.push(g(f.substring(I,A))),I=f.substring(A+l,s),K.push(I),E.push(d(I,M)),I=s+m,y.push(G.length),G.push("");else{I!==q&&G.push(g(f.substring(I)));break}n&&1<G.length&&Da.throwNoconcat(f);if(!k||K.length){var O=function(a){for(var b=0,c=K.length;b<c;b++){if(p&&w(a[b]))return;G[y[b]]=a[b]}return G.join("")};return S(function(a){var b=0,d=K.length,e=Array(d);try{for(;b<d;b++)e[b]=E[b](a);return O(e)}catch(g){c(Da.interr(f,g))}},{exp:f,expressions:K,$$watchDelegate:function(a,
+b){var c;return a.$watchGroup(E,function(d,e){var f=O(d);D(b)&&b.call(this,f,d!==e?c:f,a);c=f})}})}}var l=a.length,m=b.length,n=new RegExp(a.replace(/./g,f),"g"),p=new RegExp(b.replace(/./g,f),"g");k.startSymbol=function(){return a};k.endSymbol=function(){return b};return k}]}function Cf(){this.$get=["$rootScope","$window","$q","$$q","$browser",function(a,b,d,c,e){function f(f,k,l,m){function n(){p?f.apply(null,r):f(t)}var p=4<arguments.length,r=p?va.call(arguments,4):[],J=b.setInterval,v=b.clearInterval,
+t=0,M=u(m)&&!m,q=(M?c:d).defer(),A=q.promise;l=u(l)?l:0;A.$$intervalId=J(function(){M?e.defer(n):a.$evalAsync(n);q.notify(t++);0<l&&t>=l&&(q.resolve(t),v(A.$$intervalId),delete g[A.$$intervalId]);M||a.$apply()},k);g[A.$$intervalId]=q;return A}var g={};f.cancel=function(a){return a&&a.$$intervalId in g?(g[a.$$intervalId].promise.catch(z),g[a.$$intervalId].reject("canceled"),b.clearInterval(a.$$intervalId),delete g[a.$$intervalId],!0):!1};return f}]}function qc(a){a=a.split("/");for(var b=a.length;b--;)a[b]=
+db(a[b]);return a.join("/")}function zd(a,b){var d=Ca(a);b.$$protocol=d.protocol;b.$$host=d.hostname;b.$$port=Z(d.port)||xg[d.protocol]||null}function Ad(a,b){if(yg.test(a))throw kb("badpath",a);var d="/"!==a.charAt(0);d&&(a="/"+a);var c=Ca(a);b.$$path=decodeURIComponent(d&&"/"===c.pathname.charAt(0)?c.pathname.substring(1):c.pathname);b.$$search=Rc(c.search);b.$$hash=decodeURIComponent(c.hash);b.$$path&&"/"!==b.$$path.charAt(0)&&(b.$$path="/"+b.$$path)}function rc(a,b){return a.slice(0,b.length)===
+b}function ka(a,b){if(rc(b,a))return b.substr(a.length)}function Aa(a){var b=a.indexOf("#");return-1===b?a:a.substr(0,b)}function lb(a){return a.replace(/(#.+)|#$/,"$1")}function sc(a,b,d){this.$$html5=!0;d=d||"";zd(a,this);this.$$parse=function(a){var d=ka(b,a);if(!F(d))throw kb("ipthprfx",a,b);Ad(d,this);this.$$path||(this.$$path="/");this.$$compose()};this.$$compose=function(){var a=Zb(this.$$search),d=this.$$hash?"#"+db(this.$$hash):"";this.$$url=qc(this.$$path)+(a?"?"+a:"")+d;this.$$absUrl=b+
+this.$$url.substr(1);this.$$urlUpdatedByLocation=!0};this.$$parseLinkUrl=function(c,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),!0;var f,g;u(f=ka(a,c))?(g=f,g=d&&u(f=ka(d,f))?b+(ka("/",f)||f):a+g):u(f=ka(b,c))?g=b+f:b===c+"/"&&(g=b);g&&this.$$parse(g);return!!g}}function tc(a,b,d){zd(a,this);this.$$parse=function(c){var e=ka(a,c)||ka(b,c),f;w(e)||"#"!==e.charAt(0)?this.$$html5?f=e:(f="",w(e)&&(a=c,this.replace())):(f=ka(d,e),w(f)&&(f=e));Ad(f,this);c=this.$$path;var e=a,g=/^\/[A-Z]:(\/.*)/;rc(f,
+e)&&(f=f.replace(e,""));g.exec(f)||(c=(f=g.exec(c))?f[1]:c);this.$$path=c;this.$$compose()};this.$$compose=function(){var b=Zb(this.$$search),e=this.$$hash?"#"+db(this.$$hash):"";this.$$url=qc(this.$$path)+(b?"?"+b:"")+e;this.$$absUrl=a+(this.$$url?d+this.$$url:"");this.$$urlUpdatedByLocation=!0};this.$$parseLinkUrl=function(b,d){return Aa(a)===Aa(b)?(this.$$parse(b),!0):!1}}function Bd(a,b,d){this.$$html5=!0;tc.apply(this,arguments);this.$$parseLinkUrl=function(c,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),
+!0;var f,g;a===Aa(c)?f=c:(g=ka(b,c))?f=a+d+g:b===c+"/"&&(f=b);f&&this.$$parse(f);return!!f};this.$$compose=function(){var b=Zb(this.$$search),e=this.$$hash?"#"+db(this.$$hash):"";this.$$url=qc(this.$$path)+(b?"?"+b:"")+e;this.$$absUrl=a+d+this.$$url;this.$$urlUpdatedByLocation=!0}}function Jb(a){return function(){return this[a]}}function Cd(a,b){return function(d){if(w(d))return this[a];this[a]=b(d);this.$$compose();return this}}function Jf(){var a="!",b={enabled:!1,requireBase:!0,rewriteLinks:!0};
+this.hashPrefix=function(b){return u(b)?(a=b,this):a};this.html5Mode=function(a){if(Ha(a))return b.enabled=a,this;if(C(a)){Ha(a.enabled)&&(b.enabled=a.enabled);Ha(a.requireBase)&&(b.requireBase=a.requireBase);if(Ha(a.rewriteLinks)||F(a.rewriteLinks))b.rewriteLinks=a.rewriteLinks;return this}return b};this.$get=["$rootScope","$browser","$sniffer","$rootElement","$window",function(d,c,e,f,g){function h(a,b,d){var e=l.url(),f=l.$$state;try{c.url(a,b,d),l.$$state=c.state()}catch(g){throw l.url(e),l.$$state=
+f,g;}}function k(a,b){d.$broadcast("$locationChangeSuccess",l.absUrl(),a,l.$$state,b)}var l,m;m=c.baseHref();var n=c.url(),p;if(b.enabled){if(!m&&b.requireBase)throw kb("nobase");p=n.substring(0,n.indexOf("/",n.indexOf("//")+2))+(m||"/");m=e.history?sc:Bd}else p=Aa(n),m=tc;var r=p.substr(0,Aa(p).lastIndexOf("/")+1);l=new m(p,r,"#"+a);l.$$parseLinkUrl(n,n);l.$$state=c.state();var J=/^\s*(javascript|mailto):/i;f.on("click",function(a){var e=b.rewriteLinks;if(e&&!a.ctrlKey&&!a.metaKey&&!a.shiftKey&&
+2!==a.which&&2!==a.button){for(var h=B(a.target);"a"!==wa(h[0]);)if(h[0]===f[0]||!(h=h.parent())[0])return;if(!F(e)||!w(h.attr(e))){var e=h.prop("href"),k=h.attr("href")||h.attr("xlink:href");C(e)&&"[object SVGAnimatedString]"===e.toString()&&(e=Ca(e.animVal).href);J.test(e)||!e||h.attr("target")||a.isDefaultPrevented()||!l.$$parseLinkUrl(e,k)||(a.preventDefault(),l.absUrl()!==c.url()&&(d.$apply(),g.angular["ff-684208-preventDefault"]=!0))}}});lb(l.absUrl())!==lb(n)&&c.url(l.absUrl(),!0);var v=!0;
+c.onUrlChange(function(a,b){rc(a,r)?(d.$evalAsync(function(){var c=l.absUrl(),e=l.$$state,f;a=lb(a);l.$$parse(a);l.$$state=b;f=d.$broadcast("$locationChangeStart",a,c,b,e).defaultPrevented;l.absUrl()===a&&(f?(l.$$parse(c),l.$$state=e,h(c,!1,e)):(v=!1,k(c,e)))}),d.$$phase||d.$digest()):g.location.href=a});d.$watch(function(){if(v||l.$$urlUpdatedByLocation){l.$$urlUpdatedByLocation=!1;var a=lb(c.url()),b=lb(l.absUrl()),f=c.state(),g=l.$$replace,m=a!==b||l.$$html5&&e.history&&f!==l.$$state;if(v||m)v=
+!1,d.$evalAsync(function(){var b=l.absUrl(),c=d.$broadcast("$locationChangeStart",b,a,l.$$state,f).defaultPrevented;l.absUrl()===b&&(c?(l.$$parse(a),l.$$state=f):(m&&h(b,g,f===l.$$state?null:l.$$state),k(a,f)))})}l.$$replace=!1});return l}]}function Kf(){var a=!0,b=this;this.debugEnabled=function(b){return u(b)?(a=b,this):a};this.$get=["$window",function(d){function c(a){a instanceof Error&&(a.stack&&f?a=a.message&&-1===a.stack.indexOf(a.message)?"Error: "+a.message+"\n"+a.stack:a.stack:a.sourceURL&&
+(a=a.message+"\n"+a.sourceURL+":"+a.line));return a}function e(a){var b=d.console||{},e=b[a]||b.log||z;a=!1;try{a=!!e.apply}catch(f){}return a?function(){var a=[];q(arguments,function(b){a.push(c(b))});return e.apply(b,a)}:function(a,b){e(a,null==b?"":b)}}var f=za||/\bEdge\//.test(d.navigator&&d.navigator.userAgent);return{log:e("log"),info:e("info"),warn:e("warn"),error:e("error"),debug:function(){var c=e("debug");return function(){a&&c.apply(b,arguments)}}()}}]}function zg(a){return a+""}function Ag(a,
+b){return"undefined"!==typeof a?a:b}function Dd(a,b){return"undefined"===typeof a?b:"undefined"===typeof b?a:a+b}function U(a,b){var d,c,e;switch(a.type){case s.Program:d=!0;q(a.body,function(a){U(a.expression,b);d=d&&a.expression.constant});a.constant=d;break;case s.Literal:a.constant=!0;a.toWatch=[];break;case s.UnaryExpression:U(a.argument,b);a.constant=a.argument.constant;a.toWatch=a.argument.toWatch;break;case s.BinaryExpression:U(a.left,b);U(a.right,b);a.constant=a.left.constant&&a.right.constant;
+a.toWatch=a.left.toWatch.concat(a.right.toWatch);break;case s.LogicalExpression:U(a.left,b);U(a.right,b);a.constant=a.left.constant&&a.right.constant;a.toWatch=a.constant?[]:[a];break;case s.ConditionalExpression:U(a.test,b);U(a.alternate,b);U(a.consequent,b);a.constant=a.test.constant&&a.alternate.constant&&a.consequent.constant;a.toWatch=a.constant?[]:[a];break;case s.Identifier:a.constant=!1;a.toWatch=[a];break;case s.MemberExpression:U(a.object,b);a.computed&&U(a.property,b);a.constant=a.object.constant&&
+(!a.computed||a.property.constant);a.toWatch=[a];break;case s.CallExpression:d=e=a.filter?!b(a.callee.name).$stateful:!1;c=[];q(a.arguments,function(a){U(a,b);d=d&&a.constant;a.constant||c.push.apply(c,a.toWatch)});a.constant=d;a.toWatch=e?c:[a];break;case s.AssignmentExpression:U(a.left,b);U(a.right,b);a.constant=a.left.constant&&a.right.constant;a.toWatch=[a];break;case s.ArrayExpression:d=!0;c=[];q(a.elements,function(a){U(a,b);d=d&&a.constant;a.constant||c.push.apply(c,a.toWatch)});a.constant=
+d;a.toWatch=c;break;case s.ObjectExpression:d=!0;c=[];q(a.properties,function(a){U(a.value,b);d=d&&a.value.constant&&!a.computed;a.value.constant||c.push.apply(c,a.value.toWatch);a.computed&&(U(a.key,b),a.key.constant||c.push.apply(c,a.key.toWatch))});a.constant=d;a.toWatch=c;break;case s.ThisExpression:a.constant=!1;a.toWatch=[];break;case s.LocalsExpression:a.constant=!1,a.toWatch=[]}}function Ed(a){if(1===a.length){a=a[0].expression;var b=a.toWatch;return 1!==b.length?b:b[0]!==a?b:void 0}}function Fd(a){return a.type===
+s.Identifier||a.type===s.MemberExpression}function Gd(a){if(1===a.body.length&&Fd(a.body[0].expression))return{type:s.AssignmentExpression,left:a.body[0].expression,right:{type:s.NGValueParameter},operator:"="}}function Hd(a){this.$filter=a}function Id(a){this.$filter=a}function uc(a,b,d){this.ast=new s(a,d);this.astCompiler=d.csp?new Id(b):new Hd(b)}function vc(a){return D(a.valueOf)?a.valueOf():Bg.call(a)}function Lf(){var a=V(),b={"true":!0,"false":!1,"null":null,undefined:void 0},d,c;this.addLiteral=
+function(a,c){b[a]=c};this.setIdentifierFns=function(a,b){d=a;c=b;return this};this.$get=["$filter",function(e){function f(a,b,c){return null==a||null==b?a===b:"object"!==typeof a||(a=vc(a),"object"!==typeof a||c)?a===b||a!==a&&b!==b:!1}function g(a,b,c,d,e){var g=d.inputs,h;if(1===g.length){var k=f,g=g[0];return a.$watch(function(a){var b=g(a);f(b,k,d.literal)||(h=d(a,void 0,void 0,[b]),k=b&&vc(b));return h},b,c,e)}for(var l=[],m=[],n=0,E=g.length;n<E;n++)l[n]=f,m[n]=null;return a.$watch(function(a){for(var b=
+!1,c=0,e=g.length;c<e;c++){var k=g[c](a);if(b||(b=!f(k,l[c],d.literal)))m[c]=k,l[c]=k&&vc(k)}b&&(h=d(a,void 0,void 0,m));return h},b,c,e)}function h(a,b,c,d,e){function f(a){return d(a)}function h(a,c,d){n=a;D(b)&&b(a,c,d);l(a)&&d.$$postDigest(function(){l(n)&&m()})}var l=d.literal?k:u,m,n;return m=d.inputs?g(a,h,c,d,e):a.$watch(f,h,c)}function k(a){var b=!0;q(a,function(a){u(a)||(b=!1)});return b}function l(a,b,c,d){var e=a.$watch(function(a){e();return d(a)},b,c);return e}function m(a,b){function c(d,
+e,g,h){g=f&&h?h[0]:a(d,e,g,h);return b(g,d,e)}function d(c,e,g,k){g=f&&k?k[0]:a(c,e,g,k);c=b(g,c,e);return h(g)?c:g}if(!b)return a;var e=a.$$watchDelegate,f=!1,h=a.literal?k:u,l=a.oneTime?d:c;l.literal=a.literal;l.oneTime=a.oneTime;f=!a.inputs;e&&e!==g?(l.$$watchDelegate=e,l.inputs=a.inputs):b.$stateful||(l.$$watchDelegate=g,l.inputs=a.inputs?a.inputs:[a]);return l}var n={csp:Ga().noUnsafeEval,literals:ra(b),isIdentifierStart:D(d)&&d,isIdentifierContinue:D(c)&&c};return function(b,c){var d,f,k;switch(typeof b){case "string":return k=
+b=b.trim(),d=a[k],d||(":"===b.charAt(0)&&":"===b.charAt(1)&&(f=!0,b=b.substring(2)),d=new wc(n),d=(new uc(d,e,n)).parse(b),d.constant?d.$$watchDelegate=l:f?(d.oneTime=!0,d.$$watchDelegate=h):d.inputs&&(d.$$watchDelegate=g),a[k]=d),m(d,c);case "function":return m(b,c);default:return m(z,c)}}}]}function Nf(){var a=!0;this.$get=["$rootScope","$exceptionHandler",function(b,d){return Jd(function(a){b.$evalAsync(a)},d,a)}];this.errorOnUnhandledRejections=function(b){return u(b)?(a=b,this):a}}function Of(){var a=
+!0;this.$get=["$browser","$exceptionHandler",function(b,d){return Jd(function(a){b.defer(a)},d,a)}];this.errorOnUnhandledRejections=function(b){return u(b)?(a=b,this):a}}function Jd(a,b,d){function c(){return new e}function e(){var a=this.promise=new f;this.resolve=function(b){k(a,b)};this.reject=function(b){m(a,b)};this.notify=function(b){p(a,b)}}function f(){this.$$state={status:0}}function g(){for(;!s&&A.length;){var a=A.shift();if(!a.pur){a.pur=!0;var c=a.value,c="Possibly unhandled rejection: "+
+("function"===typeof c?c.toString().replace(/ \{[\s\S]*$/,""):w(c)?"undefined":"string"!==typeof c?Be(c,void 0):c);a.value instanceof Error?b(a.value,c):b(c)}}}function h(b){!d||b.pending||2!==b.status||b.pur||(0===s&&0===A.length&&a(g),A.push(b));!b.processScheduled&&b.pending&&(b.processScheduled=!0,++s,a(function(){var c,e,f;f=b.pending;b.processScheduled=!1;b.pending=void 0;try{for(var h=0,l=f.length;h<l;++h){b.pur=!0;e=f[h][0];c=f[h][b.status];try{D(c)?k(e,c(b.value)):1===b.status?k(e,b.value):
+m(e,b.value)}catch(n){m(e,n)}}}finally{--s,d&&0===s&&a(g)}}))}function k(a,b){a.$$state.status||(b===a?n(a,M("qcycle",b)):l(a,b))}function l(a,b){function c(b){g||(g=!0,l(a,b))}function d(b){g||(g=!0,n(a,b))}function e(b){p(a,b)}var f,g=!1;try{if(C(b)||D(b))f=b.then;D(f)?(a.$$state.status=-1,f.call(b,c,d,e)):(a.$$state.value=b,a.$$state.status=1,h(a.$$state))}catch(k){d(k)}}function m(a,b){a.$$state.status||n(a,b)}function n(a,b){a.$$state.value=b;a.$$state.status=2;h(a.$$state)}function p(c,d){var e=
+c.$$state.pending;0>=c.$$state.status&&e&&e.length&&a(function(){for(var a,c,f=0,g=e.length;f<g;f++){c=e[f][0];a=e[f][3];try{p(c,D(a)?a(d):d)}catch(h){b(h)}}})}function r(a){var b=new f;m(b,a);return b}function J(a,b,c){var d=null;try{D(c)&&(d=c())}catch(e){return r(e)}return d&&D(d.then)?d.then(function(){return b(a)},r):b(a)}function v(a,b,c,d){var e=new f;k(e,a);return e.then(b,c,d)}function t(a){if(!D(a))throw M("norslvr",a);var b=new f;a(function(a){k(b,a)},function(a){m(b,a)});return b}var M=
+L("$q",TypeError),s=0,A=[];S(f.prototype,{then:function(a,b,c){if(w(a)&&w(b)&&w(c))return this;var d=new f;this.$$state.pending=this.$$state.pending||[];this.$$state.pending.push([d,a,b,c]);0<this.$$state.status&&h(this.$$state);return d},"catch":function(a){return this.then(null,a)},"finally":function(a,b){return this.then(function(b){return J(b,u,a)},function(b){return J(b,r,a)},b)}});var u=v;t.prototype=f.prototype;t.defer=c;t.reject=r;t.when=v;t.resolve=u;t.all=function(a){var b=new f,c=0,d=H(a)?
+[]:{};q(a,function(a,e){c++;v(a).then(function(a){d[e]=a;--c||k(b,d)},function(a){m(b,a)})});0===c&&k(b,d);return b};t.race=function(a){var b=c();q(a,function(a){v(a).then(b.resolve,b.reject)});return b.promise};return t}function Xf(){this.$get=["$window","$timeout",function(a,b){var d=a.requestAnimationFrame||a.webkitRequestAnimationFrame,c=a.cancelAnimationFrame||a.webkitCancelAnimationFrame||a.webkitCancelRequestAnimationFrame,e=!!d,f=e?function(a){var b=d(a);return function(){c(b)}}:function(a){var c=
+b(a,16.66,!1);return function(){b.cancel(c)}};f.supported=e;return f}]}function Mf(){function a(a){function b(){this.$$watchers=this.$$nextSibling=this.$$childHead=this.$$childTail=null;this.$$listeners={};this.$$listenerCount={};this.$$watchersCount=0;this.$id=++qb;this.$$ChildScope=null}b.prototype=a;return b}var b=10,d=L("$rootScope"),c=null,e=null;this.digestTtl=function(a){arguments.length&&(b=a);return b};this.$get=["$exceptionHandler","$parse","$browser",function(f,g,h){function k(a){a.currentScope.$$destroyed=
+!0}function l(a){9===za&&(a.$$childHead&&l(a.$$childHead),a.$$nextSibling&&l(a.$$nextSibling));a.$parent=a.$$nextSibling=a.$$prevSibling=a.$$childHead=a.$$childTail=a.$root=a.$$watchers=null}function m(){this.$id=++qb;this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=null;this.$root=this;this.$$destroyed=!1;this.$$listeners={};this.$$listenerCount={};this.$$watchersCount=0;this.$$isolateBindings=null}function n(a){if(M.$$phase)throw d("inprog",
+M.$$phase);M.$$phase=a}function p(a,b){do a.$$watchersCount+=b;while(a=a.$parent)}function r(a,b,c){do a.$$listenerCount[c]-=b,0===a.$$listenerCount[c]&&delete a.$$listenerCount[c];while(a=a.$parent)}function J(){}function v(){for(;u.length;)try{u.shift()()}catch(a){f(a)}e=null}function t(){null===e&&(e=h.defer(function(){M.$apply(v)}))}m.prototype={constructor:m,$new:function(b,c){var d;c=c||this;b?(d=new m,d.$root=this.$root):(this.$$ChildScope||(this.$$ChildScope=a(this)),d=new this.$$ChildScope);
+d.$parent=c;d.$$prevSibling=c.$$childTail;c.$$childHead?(c.$$childTail.$$nextSibling=d,c.$$childTail=d):c.$$childHead=c.$$childTail=d;(b||c!==this)&&d.$on("$destroy",k);return d},$watch:function(a,b,d,e){var f=g(a);if(f.$$watchDelegate)return f.$$watchDelegate(this,b,d,f,a);var h=this,k=h.$$watchers,l={fn:b,last:J,get:f,exp:e||a,eq:!!d};c=null;D(b)||(l.fn=z);k||(k=h.$$watchers=[],k.$$digestWatchIndex=-1);k.unshift(l);k.$$digestWatchIndex++;p(this,1);return function(){var a=$a(k,l);0<=a&&(p(h,-1),
+a<k.$$digestWatchIndex&&k.$$digestWatchIndex--);c=null}},$watchGroup:function(a,b){function c(){h=!1;k?(k=!1,b(e,e,g)):b(e,d,g)}var d=Array(a.length),e=Array(a.length),f=[],g=this,h=!1,k=!0;if(!a.length){var l=!0;g.$evalAsync(function(){l&&b(e,e,g)});return function(){l=!1}}if(1===a.length)return this.$watch(a[0],function(a,c,f){e[0]=a;d[0]=c;b(e,a===c?e:d,f)});q(a,function(a,b){var k=g.$watch(a,function(a,f){e[b]=a;d[b]=f;h||(h=!0,g.$evalAsync(c))});f.push(k)});return function(){for(;f.length;)f.shift()()}},
+$watchCollection:function(a,b){function c(a){e=a;var b,d,g,h;if(!w(e)){if(C(e))if(qa(e))for(f!==n&&(f=n,t=f.length=0,l++),a=e.length,t!==a&&(l++,f.length=t=a),b=0;b<a;b++)h=f[b],g=e[b],d=h!==h&&g!==g,d||h===g||(l++,f[b]=g);else{f!==p&&(f=p={},t=0,l++);a=0;for(b in e)ua.call(e,b)&&(a++,g=e[b],h=f[b],b in f?(d=h!==h&&g!==g,d||h===g||(l++,f[b]=g)):(t++,f[b]=g,l++));if(t>a)for(b in l++,f)ua.call(e,b)||(t--,delete f[b])}else f!==e&&(f=e,l++);return l}}c.$stateful=!0;var d=this,e,f,h,k=1<b.length,l=0,m=
+g(a,c),n=[],p={},r=!0,t=0;return this.$watch(m,function(){r?(r=!1,b(e,e,d)):b(e,h,d);if(k)if(C(e))if(qa(e)){h=Array(e.length);for(var a=0;a<e.length;a++)h[a]=e[a]}else for(a in h={},e)ua.call(e,a)&&(h[a]=e[a]);else h=e})},$digest:function(){var a,g,k,l,m,p,r,t=b,q,u=[],w,x;n("$digest");h.$$checkUrlChange();this===M&&null!==e&&(h.defer.cancel(e),v());c=null;do{r=!1;q=this;for(p=0;p<s.length;p++){try{x=s[p],l=x.fn,l(x.scope,x.locals)}catch(z){f(z)}c=null}s.length=0;a:do{if(p=q.$$watchers)for(p.$$digestWatchIndex=
+p.length;p.$$digestWatchIndex--;)try{if(a=p[p.$$digestWatchIndex])if(m=a.get,(g=m(q))!==(k=a.last)&&!(a.eq?sa(g,k):da(g)&&da(k)))r=!0,c=a,a.last=a.eq?ra(g,null):g,l=a.fn,l(g,k===J?g:k,q),5>t&&(w=4-t,u[w]||(u[w]=[]),u[w].push({msg:D(a.exp)?"fn: "+(a.exp.name||a.exp.toString()):a.exp,newVal:g,oldVal:k}));else if(a===c){r=!1;break a}}catch(B){f(B)}if(!(p=q.$$watchersCount&&q.$$childHead||q!==this&&q.$$nextSibling))for(;q!==this&&!(p=q.$$nextSibling);)q=q.$parent}while(q=p);if((r||s.length)&&!t--)throw M.$$phase=
+null,d("infdig",b,u);}while(r||s.length);for(M.$$phase=null;I<A.length;)try{A[I++]()}catch(F){f(F)}A.length=I=0;h.$$checkUrlChange()},$destroy:function(){if(!this.$$destroyed){var a=this.$parent;this.$broadcast("$destroy");this.$$destroyed=!0;this===M&&h.$$applicationDestroyed();p(this,-this.$$watchersCount);for(var b in this.$$listenerCount)r(this,this.$$listenerCount[b],b);a&&a.$$childHead===this&&(a.$$childHead=this.$$nextSibling);a&&a.$$childTail===this&&(a.$$childTail=this.$$prevSibling);this.$$prevSibling&&
+(this.$$prevSibling.$$nextSibling=this.$$nextSibling);this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling);this.$destroy=this.$digest=this.$apply=this.$evalAsync=this.$applyAsync=z;this.$on=this.$watch=this.$watchGroup=function(){return z};this.$$listeners={};this.$$nextSibling=null;l(this)}},$eval:function(a,b){return g(a)(this,b)},$evalAsync:function(a,b){M.$$phase||s.length||h.defer(function(){s.length&&M.$digest()});s.push({scope:this,fn:g(a),locals:b})},$$postDigest:function(a){A.push(a)},
+$apply:function(a){try{n("$apply");try{return this.$eval(a)}finally{M.$$phase=null}}catch(b){f(b)}finally{try{M.$digest()}catch(c){throw f(c),c;}}},$applyAsync:function(a){function b(){c.$eval(a)}var c=this;a&&u.push(b);a=g(a);t()},$on:function(a,b){var c=this.$$listeners[a];c||(this.$$listeners[a]=c=[]);c.push(b);var d=this;do d.$$listenerCount[a]||(d.$$listenerCount[a]=0),d.$$listenerCount[a]++;while(d=d.$parent);var e=this;return function(){var d=c.indexOf(b);-1!==d&&(c[d]=null,r(e,1,a))}},$emit:function(a,
+b){var c=[],d,e=this,g=!1,h={name:a,targetScope:e,stopPropagation:function(){g=!0},preventDefault:function(){h.defaultPrevented=!0},defaultPrevented:!1},k=ab([h],arguments,1),l,m;do{d=e.$$listeners[a]||c;h.currentScope=e;l=0;for(m=d.length;l<m;l++)if(d[l])try{d[l].apply(null,k)}catch(n){f(n)}else d.splice(l,1),l--,m--;if(g)return h.currentScope=null,h;e=e.$parent}while(e);h.currentScope=null;return h},$broadcast:function(a,b){var c=this,d=this,e={name:a,targetScope:this,preventDefault:function(){e.defaultPrevented=
+!0},defaultPrevented:!1};if(!this.$$listenerCount[a])return e;for(var g=ab([e],arguments,1),h,k;c=d;){e.currentScope=c;d=c.$$listeners[a]||[];h=0;for(k=d.length;h<k;h++)if(d[h])try{d[h].apply(null,g)}catch(l){f(l)}else d.splice(h,1),h--,k--;if(!(d=c.$$listenerCount[a]&&c.$$childHead||c!==this&&c.$$nextSibling))for(;c!==this&&!(d=c.$$nextSibling);)c=c.$parent}e.currentScope=null;return e}};var M=new m,s=M.$$asyncQueue=[],A=M.$$postDigestQueue=[],u=M.$$applyAsyncQueue=[],I=0;return M}]}function Ee(){var a=
+/^\s*(https?|ftp|mailto|tel|file):/,b=/^\s*((https?|ftp|file|blob):|data:image\/)/;this.aHrefSanitizationWhitelist=function(b){return u(b)?(a=b,this):a};this.imgSrcSanitizationWhitelist=function(a){return u(a)?(b=a,this):b};this.$get=function(){return function(d,c){var e=c?b:a,f;f=Ca(d).href;return""===f||f.match(e)?d:"unsafe:"+f}}}function Cg(a){if("self"===a)return a;if(F(a)){if(-1<a.indexOf("***"))throw ta("iwcard",a);a=Kd(a).replace(/\\\*\\\*/g,".*").replace(/\\\*/g,"[^:/.?&;]*");return new RegExp("^"+
+a+"$")}if(Xa(a))return new RegExp("^"+a.source+"$");throw ta("imatcher");}function Ld(a){var b=[];u(a)&&q(a,function(a){b.push(Cg(a))});return b}function Qf(){this.SCE_CONTEXTS=oa;var a=["self"],b=[];this.resourceUrlWhitelist=function(b){arguments.length&&(a=Ld(b));return a};this.resourceUrlBlacklist=function(a){arguments.length&&(b=Ld(a));return b};this.$get=["$injector",function(d){function c(a,b){return"self"===a?yd(b):!!a.exec(b.href)}function e(a){var b=function(a){this.$$unwrapTrustedValue=
+function(){return a}};a&&(b.prototype=new a);b.prototype.valueOf=function(){return this.$$unwrapTrustedValue()};b.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()};return b}var f=function(a){throw ta("unsafe");};d.has("$sanitize")&&(f=d.get("$sanitize"));var g=e(),h={};h[oa.HTML]=e(g);h[oa.CSS]=e(g);h[oa.URL]=e(g);h[oa.JS]=e(g);h[oa.RESOURCE_URL]=e(h[oa.URL]);return{trustAs:function(a,b){var c=h.hasOwnProperty(a)?h[a]:null;if(!c)throw ta("icontext",a,b);if(null===b||w(b)||
+""===b)return b;if("string"!==typeof b)throw ta("itype",a);return new c(b)},getTrusted:function(d,e){if(null===e||w(e)||""===e)return e;var g=h.hasOwnProperty(d)?h[d]:null;if(g&&e instanceof g)return e.$$unwrapTrustedValue();if(d===oa.RESOURCE_URL){var g=Ca(e.toString()),n,p,r=!1;n=0;for(p=a.length;n<p;n++)if(c(a[n],g)){r=!0;break}if(r)for(n=0,p=b.length;n<p;n++)if(c(b[n],g)){r=!1;break}if(r)return e;throw ta("insecurl",e.toString());}if(d===oa.HTML)return f(e);throw ta("unsafe");},valueOf:function(a){return a instanceof
+g?a.$$unwrapTrustedValue():a}}}]}function Pf(){var a=!0;this.enabled=function(b){arguments.length&&(a=!!b);return a};this.$get=["$parse","$sceDelegate",function(b,d){if(a&&8>za)throw ta("iequirks");var c=pa(oa);c.isEnabled=function(){return a};c.trustAs=d.trustAs;c.getTrusted=d.getTrusted;c.valueOf=d.valueOf;a||(c.trustAs=c.getTrusted=function(a,b){return b},c.valueOf=Ya);c.parseAs=function(a,d){var e=b(d);return e.literal&&e.constant?e:b(d,function(b){return c.getTrusted(a,b)})};var e=c.parseAs,
+f=c.getTrusted,g=c.trustAs;q(oa,function(a,b){var d=Q(b);c[("parse_as_"+d).replace(xc,gb)]=function(b){return e(a,b)};c[("get_trusted_"+d).replace(xc,gb)]=function(b){return f(a,b)};c[("trust_as_"+d).replace(xc,gb)]=function(b){return g(a,b)}});return c}]}function Rf(){this.$get=["$window","$document",function(a,b){var d={},c=!((!a.nw||!a.nw.process)&&a.chrome&&(a.chrome.app&&a.chrome.app.runtime||!a.chrome.app&&a.chrome.runtime&&a.chrome.runtime.id))&&a.history&&a.history.pushState,e=Z((/android (\d+)/.exec(Q((a.navigator||
+{}).userAgent))||[])[1]),f=/Boxee/i.test((a.navigator||{}).userAgent),g=b[0]||{},h=g.body&&g.body.style,k=!1,l=!1;h&&(k=!!("transition"in h||"webkitTransition"in h),l=!!("animation"in h||"webkitAnimation"in h));return{history:!(!c||4>e||f),hasEvent:function(a){if("input"===a&&za)return!1;if(w(d[a])){var b=g.createElement("div");d[a]="on"+a in b}return d[a]},csp:Ga(),transitions:k,animations:l,android:e}}]}function Tf(){var a;this.httpOptions=function(b){return b?(a=b,this):a};this.$get=["$exceptionHandler",
+"$templateCache","$http","$q","$sce",function(b,d,c,e,f){function g(h,k){g.totalPendingRequests++;if(!F(h)||w(d.get(h)))h=f.getTrustedResourceUrl(h);var l=c.defaults&&c.defaults.transformResponse;H(l)?l=l.filter(function(a){return a!==nc}):l===nc&&(l=null);return c.get(h,S({cache:d,transformResponse:l},a)).finally(function(){g.totalPendingRequests--}).then(function(a){d.put(h,a.data);return a.data},function(a){k||(a=Dg("tpload",h,a.status,a.statusText),b(a));return e.reject(a)})}g.totalPendingRequests=
+0;return g}]}function Uf(){this.$get=["$rootScope","$browser","$location",function(a,b,d){return{findBindings:function(a,b,d){a=a.getElementsByClassName("ng-binding");var g=[];q(a,function(a){var c=ea.element(a).data("$binding");c&&q(c,function(c){d?(new RegExp("(^|\\s)"+Kd(b)+"(\\s|\\||$)")).test(c)&&g.push(a):-1!==c.indexOf(b)&&g.push(a)})});return g},findModels:function(a,b,d){for(var g=["ng-","data-ng-","ng\\:"],h=0;h<g.length;++h){var k=a.querySelectorAll("["+g[h]+"model"+(d?"=":"*=")+'"'+b+
+'"]');if(k.length)return k}},getLocation:function(){return d.url()},setLocation:function(b){b!==d.url()&&(d.url(b),a.$digest())},whenStable:function(a){b.notifyWhenNoOutstandingRequests(a)}}}]}function Vf(){this.$get=["$rootScope","$browser","$q","$$q","$exceptionHandler",function(a,b,d,c,e){function f(f,k,l){D(f)||(l=k,k=f,f=z);var m=va.call(arguments,3),n=u(l)&&!l,p=(n?c:d).defer(),r=p.promise,q;q=b.defer(function(){try{p.resolve(f.apply(null,m))}catch(b){p.reject(b),e(b)}finally{delete g[r.$$timeoutId]}n||
+a.$apply()},k);r.$$timeoutId=q;g[q]=p;return r}var g={};f.cancel=function(a){return a&&a.$$timeoutId in g?(g[a.$$timeoutId].promise.catch(z),g[a.$$timeoutId].reject("canceled"),delete g[a.$$timeoutId],b.defer.cancel(a.$$timeoutId)):!1};return f}]}function Ca(a){za&&(aa.setAttribute("href",a),a=aa.href);aa.setAttribute("href",a);return{href:aa.href,protocol:aa.protocol?aa.protocol.replace(/:$/,""):"",host:aa.host,search:aa.search?aa.search.replace(/^\?/,""):"",hash:aa.hash?aa.hash.replace(/^#/,""):
+"",hostname:aa.hostname,port:aa.port,pathname:"/"===aa.pathname.charAt(0)?aa.pathname:"/"+aa.pathname}}function yd(a){a=F(a)?Ca(a):a;return a.protocol===Md.protocol&&a.host===Md.host}function Wf(){this.$get=la(x)}function Nd(a){function b(a){try{return decodeURIComponent(a)}catch(b){return a}}var d=a[0]||{},c={},e="";return function(){var a,g,h,k,l;try{a=d.cookie||""}catch(m){a=""}if(a!==e)for(e=a,a=e.split("; "),c={},h=0;h<a.length;h++)g=a[h],k=g.indexOf("="),0<k&&(l=b(g.substring(0,k)),w(c[l])&&
+(c[l]=b(g.substring(k+1))));return c}}function $f(){this.$get=Nd}function cd(a){function b(d,c){if(C(d)){var e={};q(d,function(a,c){e[c]=b(c,a)});return e}return a.factory(d+"Filter",c)}this.register=b;this.$get=["$injector",function(a){return function(b){return a.get(b+"Filter")}}];b("currency",Od);b("date",Pd);b("filter",Eg);b("json",Fg);b("limitTo",Gg);b("lowercase",Hg);b("number",Qd);b("orderBy",Rd);b("uppercase",Ig)}function Eg(){return function(a,b,d,c){if(!qa(a)){if(null==a)return a;throw L("filter")("notarray",
+a);}c=c||"$";var e;switch(yc(b)){case "function":break;case "boolean":case "null":case "number":case "string":e=!0;case "object":b=Jg(b,d,c,e);break;default:return a}return Array.prototype.filter.call(a,b)}}function Jg(a,b,d,c){var e=C(a)&&d in a;!0===b?b=sa:D(b)||(b=function(a,b){if(w(a))return!1;if(null===a||null===b)return a===b;if(C(b)||C(a)&&!Wb(a))return!1;a=Q(""+a);b=Q(""+b);return-1!==a.indexOf(b)});return function(f){return e&&!C(f)?Ea(f,a[d],b,d,!1):Ea(f,a,b,d,c)}}function Ea(a,b,d,c,e,
+f){var g=yc(a),h=yc(b);if("string"===h&&"!"===b.charAt(0))return!Ea(a,b.substring(1),d,c,e);if(H(a))return a.some(function(a){return Ea(a,b,d,c,e)});switch(g){case "object":var k;if(e){for(k in a)if(k.charAt&&"$"!==k.charAt(0)&&Ea(a[k],b,d,c,!0))return!0;return f?!1:Ea(a,b,d,c,!1)}if("object"===h){for(k in b)if(f=b[k],!D(f)&&!w(f)&&(g=k===c,!Ea(g?a:a[k],f,d,c,g,g)))return!1;return!0}return d(a,b);case "function":return!1;default:return d(a,b)}}function yc(a){return null===a?"null":typeof a}function Od(a){var b=
+a.NUMBER_FORMATS;return function(a,c,e){w(c)&&(c=b.CURRENCY_SYM);w(e)&&(e=b.PATTERNS[1].maxFrac);return null==a?a:Sd(a,b.PATTERNS[1],b.GROUP_SEP,b.DECIMAL_SEP,e).replace(/\u00A4/g,c)}}function Qd(a){var b=a.NUMBER_FORMATS;return function(a,c){return null==a?a:Sd(a,b.PATTERNS[0],b.GROUP_SEP,b.DECIMAL_SEP,c)}}function Kg(a){var b=0,d,c,e,f,g;-1<(c=a.indexOf(Td))&&(a=a.replace(Td,""));0<(e=a.search(/e/i))?(0>c&&(c=e),c+=+a.slice(e+1),a=a.substring(0,e)):0>c&&(c=a.length);for(e=0;a.charAt(e)===zc;e++);
+if(e===(g=a.length))d=[0],c=1;else{for(g--;a.charAt(g)===zc;)g--;c-=e;d=[];for(f=0;e<=g;e++,f++)d[f]=+a.charAt(e)}c>Ud&&(d=d.splice(0,Ud-1),b=c-1,c=1);return{d:d,e:b,i:c}}function Lg(a,b,d,c){var e=a.d,f=e.length-a.i;b=w(b)?Math.min(Math.max(d,f),c):+b;d=b+a.i;c=e[d];if(0<d){e.splice(Math.max(a.i,d));for(var g=d;g<e.length;g++)e[g]=0}else for(f=Math.max(0,f),a.i=1,e.length=Math.max(1,d=b+1),e[0]=0,g=1;g<d;g++)e[g]=0;if(5<=c)if(0>d-1){for(c=0;c>d;c--)e.unshift(0),a.i++;e.unshift(1);a.i++}else e[d-
+1]++;for(;f<Math.max(0,b);f++)e.push(0);if(b=e.reduceRight(function(a,b,c,d){b+=a;d[c]=b%10;return Math.floor(b/10)},0))e.unshift(b),a.i++}function Sd(a,b,d,c,e){if(!F(a)&&!ba(a)||isNaN(a))return"";var f=!isFinite(a),g=!1,h=Math.abs(a)+"",k="";if(f)k="\u221e";else{g=Kg(h);Lg(g,e,b.minFrac,b.maxFrac);k=g.d;h=g.i;e=g.e;f=[];for(g=k.reduce(function(a,b){return a&&!b},!0);0>h;)k.unshift(0),h++;0<h?f=k.splice(h,k.length):(f=k,k=[0]);h=[];for(k.length>=b.lgSize&&h.unshift(k.splice(-b.lgSize,k.length).join(""));k.length>
+b.gSize;)h.unshift(k.splice(-b.gSize,k.length).join(""));k.length&&h.unshift(k.join(""));k=h.join(d);f.length&&(k+=c+f.join(""));e&&(k+="e+"+e)}return 0>a&&!g?b.negPre+k+b.negSuf:b.posPre+k+b.posSuf}function Kb(a,b,d,c){var e="";if(0>a||c&&0>=a)c?a=-a+1:(a=-a,e="-");for(a=""+a;a.length<b;)a=zc+a;d&&(a=a.substr(a.length-b));return e+a}function Y(a,b,d,c,e){d=d||0;return function(f){f=f["get"+a]();if(0<d||f>-d)f+=d;0===f&&-12===d&&(f=12);return Kb(f,b,c,e)}}function mb(a,b,d){return function(c,e){var f=
+c["get"+a](),g=ub((d?"STANDALONE":"")+(b?"SHORT":"")+a);return e[g][f]}}function Vd(a){var b=(new Date(a,0,1)).getDay();return new Date(a,0,(4>=b?5:12)-b)}function Wd(a){return function(b){var d=Vd(b.getFullYear());b=+new Date(b.getFullYear(),b.getMonth(),b.getDate()+(4-b.getDay()))-+d;b=1+Math.round(b/6048E5);return Kb(b,a)}}function Ac(a,b){return 0>=a.getFullYear()?b.ERAS[0]:b.ERAS[1]}function Pd(a){function b(a){var b;if(b=a.match(d)){a=new Date(0);var f=0,g=0,h=b[8]?a.setUTCFullYear:a.setFullYear,
+k=b[8]?a.setUTCHours:a.setHours;b[9]&&(f=Z(b[9]+b[10]),g=Z(b[9]+b[11]));h.call(a,Z(b[1]),Z(b[2])-1,Z(b[3]));f=Z(b[4]||0)-f;g=Z(b[5]||0)-g;h=Z(b[6]||0);b=Math.round(1E3*parseFloat("0."+(b[7]||0)));k.call(a,f,g,h,b)}return a}var d=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;return function(c,d,f){var g="",h=[],k,l;d=d||"mediumDate";d=a.DATETIME_FORMATS[d]||d;F(c)&&(c=Mg.test(c)?Z(c):b(c));ba(c)&&(c=new Date(c));if(!ga(c)||!isFinite(c.getTime()))return c;
+for(;d;)(l=Ng.exec(d))?(h=ab(h,l,1),d=h.pop()):(h.push(d),d=null);var m=c.getTimezoneOffset();f&&(m=Pc(f,m),c=Yb(c,f,!0));q(h,function(b){k=Og[b];g+=k?k(c,a.DATETIME_FORMATS,m):"''"===b?"'":b.replace(/(^'|'$)/g,"").replace(/''/g,"'")});return g}}function Fg(){return function(a,b){w(b)&&(b=2);return cb(a,b)}}function Gg(){return function(a,b,d){b=Infinity===Math.abs(Number(b))?Number(b):Z(b);if(da(b))return a;ba(a)&&(a=a.toString());if(!qa(a))return a;d=!d||isNaN(d)?0:Z(d);d=0>d?Math.max(0,a.length+
+d):d;return 0<=b?Bc(a,d,d+b):0===d?Bc(a,b,a.length):Bc(a,Math.max(0,d+b),d)}}function Bc(a,b,d){return F(a)?a.slice(b,d):va.call(a,b,d)}function Rd(a){function b(b){return b.map(function(b){var c=1,d=Ya;if(D(b))d=b;else if(F(b)){if("+"===b.charAt(0)||"-"===b.charAt(0))c="-"===b.charAt(0)?-1:1,b=b.substring(1);if(""!==b&&(d=a(b),d.constant))var e=d(),d=function(a){return a[e]}}return{get:d,descending:c}})}function d(a){switch(typeof a){case "number":case "boolean":case "string":return!0;default:return!1}}
+function c(a,b){var c=0,d=a.type,k=b.type;if(d===k){var k=a.value,l=b.value;"string"===d?(k=k.toLowerCase(),l=l.toLowerCase()):"object"===d&&(C(k)&&(k=a.index),C(l)&&(l=b.index));k!==l&&(c=k<l?-1:1)}else c=d<k?-1:1;return c}return function(a,f,g,h){if(null==a)return a;if(!qa(a))throw L("orderBy")("notarray",a);H(f)||(f=[f]);0===f.length&&(f=["+"]);var k=b(f),l=g?-1:1,m=D(h)?h:c;a=Array.prototype.map.call(a,function(a,b){return{value:a,tieBreaker:{value:b,type:"number",index:b},predicateValues:k.map(function(c){var e=
+c.get(a);c=typeof e;if(null===e)c="string",e="null";else if("object"===c)a:{if(D(e.valueOf)&&(e=e.valueOf(),d(e)))break a;Wb(e)&&(e=e.toString(),d(e))}return{value:e,type:c,index:b}})}});a.sort(function(a,b){for(var c=0,d=k.length;c<d;c++){var e=m(a.predicateValues[c],b.predicateValues[c]);if(e)return e*k[c].descending*l}return m(a.tieBreaker,b.tieBreaker)*l});return a=a.map(function(a){return a.value})}}function Qa(a){D(a)&&(a={link:a});a.restrict=a.restrict||"AC";return la(a)}function Lb(a,b,d,
+c,e){this.$$controls=[];this.$error={};this.$$success={};this.$pending=void 0;this.$name=e(b.name||b.ngForm||"")(d);this.$dirty=!1;this.$valid=this.$pristine=!0;this.$submitted=this.$invalid=!1;this.$$parentForm=Mb;this.$$element=a;this.$$animate=c;Xd(this)}function Xd(a){a.$$classCache={};a.$$classCache[Yd]=!(a.$$classCache[nb]=a.$$element.hasClass(nb))}function Zd(a){function b(a,b,c){c&&!a.$$classCache[b]?(a.$$animate.addClass(a.$$element,b),a.$$classCache[b]=!0):!c&&a.$$classCache[b]&&(a.$$animate.removeClass(a.$$element,
+b),a.$$classCache[b]=!1)}function d(a,c,d){c=c?"-"+Tc(c,"-"):"";b(a,nb+c,!0===d);b(a,Yd+c,!1===d)}var c=a.set,e=a.unset;a.clazz.prototype.$setValidity=function(a,g,h){w(g)?(this.$pending||(this.$pending={}),c(this.$pending,a,h)):(this.$pending&&e(this.$pending,a,h),$d(this.$pending)&&(this.$pending=void 0));Ha(g)?g?(e(this.$error,a,h),c(this.$$success,a,h)):(c(this.$error,a,h),e(this.$$success,a,h)):(e(this.$error,a,h),e(this.$$success,a,h));this.$pending?(b(this,"ng-pending",!0),this.$valid=this.$invalid=
+void 0,d(this,"",null)):(b(this,"ng-pending",!1),this.$valid=$d(this.$error),this.$invalid=!this.$valid,d(this,"",this.$valid));g=this.$pending&&this.$pending[a]?void 0:this.$error[a]?!1:this.$$success[a]?!0:null;d(this,a,g);this.$$parentForm.$setValidity(a,g,this)}}function $d(a){if(a)for(var b in a)if(a.hasOwnProperty(b))return!1;return!0}function Cc(a){a.$formatters.push(function(b){return a.$isEmpty(b)?b:b.toString()})}function Ra(a,b,d,c,e,f){var g=Q(b[0].type);if(!e.android){var h=!1;b.on("compositionstart",
+function(){h=!0});b.on("compositionend",function(){h=!1;l()})}var k,l=function(a){k&&(f.defer.cancel(k),k=null);if(!h){var e=b.val();a=a&&a.type;"password"===g||d.ngTrim&&"false"===d.ngTrim||(e=T(e));(c.$viewValue!==e||""===e&&c.$$hasNativeValidators)&&c.$setViewValue(e,a)}};if(e.hasEvent("input"))b.on("input",l);else{var m=function(a,b,c){k||(k=f.defer(function(){k=null;b&&b.value===c||l(a)}))};b.on("keydown",function(a){var b=a.keyCode;91===b||15<b&&19>b||37<=b&&40>=b||m(a,this,this.value)});if(e.hasEvent("paste"))b.on("paste cut",
+m)}b.on("change",l);if(ae[g]&&c.$$hasNativeValidators&&g===d.type)b.on("keydown wheel mousedown",function(a){if(!k){var b=this.validity,c=b.badInput,d=b.typeMismatch;k=f.defer(function(){k=null;b.badInput===c&&b.typeMismatch===d||l(a)})}});c.$render=function(){var a=c.$isEmpty(c.$viewValue)?"":c.$viewValue;b.val()!==a&&b.val(a)}}function Nb(a,b){return function(d,c){var e,f;if(ga(d))return d;if(F(d)){'"'===d.charAt(0)&&'"'===d.charAt(d.length-1)&&(d=d.substring(1,d.length-1));if(Pg.test(d))return new Date(d);
+a.lastIndex=0;if(e=a.exec(d))return e.shift(),f=c?{yyyy:c.getFullYear(),MM:c.getMonth()+1,dd:c.getDate(),HH:c.getHours(),mm:c.getMinutes(),ss:c.getSeconds(),sss:c.getMilliseconds()/1E3}:{yyyy:1970,MM:1,dd:1,HH:0,mm:0,ss:0,sss:0},q(e,function(a,c){c<b.length&&(f[b[c]]=+a)}),new Date(f.yyyy,f.MM-1,f.dd,f.HH,f.mm,f.ss||0,1E3*f.sss||0)}return NaN}}function ob(a,b,d,c){return function(e,f,g,h,k,l,m){function n(a){return a&&!(a.getTime&&a.getTime()!==a.getTime())}function p(a){return u(a)&&!ga(a)?d(a)||
+void 0:a}Dc(e,f,g,h);Ra(e,f,g,h,k,l);var r=h&&h.$options.getOption("timezone"),q;h.$$parserName=a;h.$parsers.push(function(a){if(h.$isEmpty(a))return null;if(b.test(a))return a=d(a,q),r&&(a=Yb(a,r)),a});h.$formatters.push(function(a){if(a&&!ga(a))throw pb("datefmt",a);if(n(a))return(q=a)&&r&&(q=Yb(q,r,!0)),m("date")(a,c,r);q=null;return""});if(u(g.min)||g.ngMin){var v;h.$validators.min=function(a){return!n(a)||w(v)||d(a)>=v};g.$observe("min",function(a){v=p(a);h.$validate()})}if(u(g.max)||g.ngMax){var t;
+h.$validators.max=function(a){return!n(a)||w(t)||d(a)<=t};g.$observe("max",function(a){t=p(a);h.$validate()})}}}function Dc(a,b,d,c){(c.$$hasNativeValidators=C(b[0].validity))&&c.$parsers.push(function(a){var c=b.prop("validity")||{};return c.badInput||c.typeMismatch?void 0:a})}function be(a){a.$$parserName="number";a.$parsers.push(function(b){if(a.$isEmpty(b))return null;if(Qg.test(b))return parseFloat(b)});a.$formatters.push(function(b){if(!a.$isEmpty(b)){if(!ba(b))throw pb("numfmt",b);b=b.toString()}return b})}
+function Sa(a){u(a)&&!ba(a)&&(a=parseFloat(a));return da(a)?void 0:a}function Ec(a){var b=a.toString(),d=b.indexOf(".");return-1===d?-1<a&&1>a&&(a=/e-(\d+)$/.exec(b))?Number(a[1]):0:b.length-d-1}function ce(a,b,d){a=Number(a);var c=(a|0)!==a,e=(b|0)!==b,f=(d|0)!==d;if(c||e||f){var g=c?Ec(a):0,h=e?Ec(b):0,k=f?Ec(d):0,g=Math.max(g,h,k),g=Math.pow(10,g);a*=g;b*=g;d*=g;c&&(a=Math.round(a));e&&(b=Math.round(b));f&&(d=Math.round(d))}return 0===(a-b)%d}function de(a,b,d,c,e){if(u(c)){a=a(c);if(!a.constant)throw pb("constexpr",
+d,c);return a(b)}return e}function Fc(a,b){function d(a,b){if(!a||!a.length)return[];if(!b||!b.length)return a;var c=[],d=0;a:for(;d<a.length;d++){for(var e=a[d],m=0;m<b.length;m++)if(e===b[m])continue a;c.push(e)}return c}function c(a){var b=a;H(a)?b=a.map(c).join(" "):C(a)&&(b=Object.keys(a).filter(function(b){return a[b]}).join(" "));return b}a="ngClass"+a;var e;return["$parse",function(f){return{restrict:"AC",link:function(g,h,k){function l(a,b){var c=[];q(a,function(a){if(0<b||n[a])n[a]=(n[a]||
+0)+b,n[a]===+(0<b)&&c.push(a)});return c.join(" ")}function m(a){if(a===b){var c=r,c=l(c&&c.split(" "),1);k.$addClass(c)}else c=r,c=l(c&&c.split(" "),-1),k.$removeClass(c);p=a}var n=h.data("$classCounts"),p=!0,r;n||(n=V(),h.data("$classCounts",n));"ngClass"!==a&&(e||(e=f("$index",function(a){return a&1})),g.$watch(e,m));g.$watch(f(k[a],c),function(a){F(a)||(a=c(a));if(p===b){var e=a,f=r&&r.split(" "),g=e&&e.split(" "),e=d(f,g),f=d(g,f),e=l(e,-1),f=l(f,1);k.$addClass(f);k.$removeClass(e)}r=a})}}}]}
+function Ob(a,b,d,c,e,f,g,h,k){this.$modelValue=this.$viewValue=Number.NaN;this.$$rawModelValue=void 0;this.$validators={};this.$asyncValidators={};this.$parsers=[];this.$formatters=[];this.$viewChangeListeners=[];this.$untouched=!0;this.$touched=!1;this.$pristine=!0;this.$dirty=!1;this.$valid=!0;this.$invalid=!1;this.$error={};this.$$success={};this.$pending=void 0;this.$name=k(d.name||"",!1)(a);this.$$parentForm=Mb;this.$options=Pb;this.$$parsedNgModel=e(d.ngModel);this.$$parsedNgModelAssign=this.$$parsedNgModel.assign;
+this.$$ngModelGet=this.$$parsedNgModel;this.$$ngModelSet=this.$$parsedNgModelAssign;this.$$pendingDebounce=null;this.$$parserValid=void 0;this.$$currentValidationRunId=0;Object.defineProperty(this,"$$scope",{value:a});this.$$attr=d;this.$$element=c;this.$$animate=f;this.$$timeout=g;this.$$parse=e;this.$$q=h;this.$$exceptionHandler=b;Xd(this);Rg(this)}function Rg(a){a.$$scope.$watch(function(b){b=a.$$ngModelGet(b);if(b!==a.$modelValue&&(a.$modelValue===a.$modelValue||b===b)){a.$modelValue=a.$$rawModelValue=
+b;a.$$parserValid=void 0;for(var d=a.$formatters,c=d.length,e=b;c--;)e=d[c](e);a.$viewValue!==e&&(a.$$updateEmptyClasses(e),a.$viewValue=a.$$lastCommittedViewValue=e,a.$render(),a.$$runValidators(a.$modelValue,a.$viewValue,z))}return b})}function Gc(a){this.$$options=a}function ee(a,b){q(b,function(b,c){u(a[c])||(a[c]=b)})}function Ta(a,b){a.prop("selected",b);a.attr("selected",b)}var Sg=/^\/(.+)\/([a-z]*)$/,ua=Object.prototype.hasOwnProperty,Ic={objectMaxDepth:5},Q=function(a){return F(a)?a.toLowerCase():
+a},ub=function(a){return F(a)?a.toUpperCase():a},za,B,na,va=[].slice,sg=[].splice,Tg=[].push,ma=Object.prototype.toString,Mc=Object.getPrototypeOf,Fa=L("ng"),ea=x.angular||(x.angular={}),ac,qb=0;za=x.document.documentMode;var da=Number.isNaN||function(a){return a!==a};z.$inject=[];Ya.$inject=[];var H=Array.isArray,qe=/^\[object (?:Uint8|Uint8Clamped|Uint16|Uint32|Int8|Int16|Int32|Float32|Float64)Array]$/,T=function(a){return F(a)?a.trim():a},Kd=function(a){return a.replace(/([-()[\]{}+?*.$^|,:#<!\\])/g,
+"\\$1").replace(/\x08/g,"\\x08")},Ga=function(){if(!u(Ga.rules)){var a=x.document.querySelector("[ng-csp]")||x.document.querySelector("[data-ng-csp]");if(a){var b=a.getAttribute("ng-csp")||a.getAttribute("data-ng-csp");Ga.rules={noUnsafeEval:!b||-1!==b.indexOf("no-unsafe-eval"),noInlineStyle:!b||-1!==b.indexOf("no-inline-style")}}else{a=Ga;try{new Function(""),b=!1}catch(d){b=!0}a.rules={noUnsafeEval:b,noInlineStyle:!1}}}return Ga.rules},rb=function(){if(u(rb.name_))return rb.name_;var a,b,d=Ja.length,
+c,e;for(b=0;b<d;++b)if(c=Ja[b],a=x.document.querySelector("["+c.replace(":","\\:")+"jq]")){e=a.getAttribute(c+"jq");break}return rb.name_=e},se=/:/g,Ja=["ng-","data-ng-","ng:","x-ng-"],ve=function(a){var b=a.currentScript;if(!b)return!0;if(!(b instanceof x.HTMLScriptElement||b instanceof x.SVGScriptElement))return!1;b=b.attributes;return[b.getNamedItem("src"),b.getNamedItem("href"),b.getNamedItem("xlink:href")].every(function(b){if(!b)return!0;if(!b.value)return!1;var c=a.createElement("a");c.href=
+b.value;if(a.location.origin===c.origin)return!0;switch(c.protocol){case "http:":case "https:":case "ftp:":case "blob:":case "file:":case "data:":return!0;default:return!1}})}(x.document),ye=/[A-Z]/g,Uc=!1,Ia=3,De={full:"1.6.4",major:1,minor:6,dot:4,codeName:"phenomenal-footnote"};W.expando="ng339";var hb=W.cache={},eg=1;W._data=function(a){return this.cache[a[this.expando]]||{}};var ag=/-([a-z])/g,Ug=/^-ms-/,zb={mouseleave:"mouseout",mouseenter:"mouseover"},dc=L("jqLite"),dg=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,
+cc=/<|&#?\w+;/,bg=/<([\w:-]+)/,cg=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,ha={option:[1,'<select multiple="multiple">',"</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ha.optgroup=ha.option;ha.tbody=ha.tfoot=ha.colgroup=ha.caption=ha.thead;ha.th=ha.td;var jg=x.Node.prototype.contains||function(a){return!!(this.compareDocumentPosition(a)&
+16)},Na=W.prototype={ready:ed,toString:function(){var a=[];q(this,function(b){a.push(""+b)});return"["+a.join(", ")+"]"},eq:function(a){return 0<=a?B(this[a]):B(this[this.length+a])},length:0,push:Tg,sort:[].sort,splice:[].splice},Fb={};q("multiple selected checked disabled readOnly required open".split(" "),function(a){Fb[Q(a)]=a});var jd={};q("input select option textarea button form details".split(" "),function(a){jd[a]=!0});var rd={ngMinlength:"minlength",ngMaxlength:"maxlength",ngMin:"min",ngMax:"max",
+ngPattern:"pattern",ngStep:"step"};q({data:hc,removeData:gc,hasData:function(a){for(var b in hb[a.ng339])return!0;return!1},cleanData:function(a){for(var b=0,d=a.length;b<d;b++)gc(a[b])}},function(a,b){W[b]=a});q({data:hc,inheritedData:Db,scope:function(a){return B.data(a,"$scope")||Db(a.parentNode||a,["$isolateScope","$scope"])},isolateScope:function(a){return B.data(a,"$isolateScope")||B.data(a,"$isolateScopeNoTemplate")},controller:gd,injector:function(a){return Db(a,"$injector")},removeAttr:function(a,
+b){a.removeAttribute(b)},hasClass:Ab,css:function(a,b,d){b=wb(b.replace(Ug,"ms-"));if(u(d))a.style[b]=d;else return a.style[b]},attr:function(a,b,d){var c=a.nodeType;if(c!==Ia&&2!==c&&8!==c&&a.getAttribute){var c=Q(b),e=Fb[c];if(u(d))null===d||!1===d&&e?a.removeAttribute(b):a.setAttribute(b,e?c:d);else return a=a.getAttribute(b),e&&null!==a&&(a=c),null===a?void 0:a}},prop:function(a,b,d){if(u(d))a[b]=d;else return a[b]},text:function(){function a(a,d){if(w(d)){var c=a.nodeType;return 1===c||c===Ia?
+a.textContent:""}a.textContent=d}a.$dv="";return a}(),val:function(a,b){if(w(b)){if(a.multiple&&"select"===wa(a)){var d=[];q(a.options,function(a){a.selected&&d.push(a.value||a.text)});return d}return a.value}a.value=b},html:function(a,b){if(w(b))return a.innerHTML;xb(a,!0);a.innerHTML=b},empty:hd},function(a,b){W.prototype[b]=function(b,c){var e,f,g=this.length;if(a!==hd&&w(2===a.length&&a!==Ab&&a!==gd?b:c)){if(C(b)){for(e=0;e<g;e++)if(a===hc)a(this[e],b);else for(f in b)a(this[e],f,b[f]);return this}e=
+a.$dv;g=w(e)?Math.min(g,1):g;for(f=0;f<g;f++){var h=a(this[f],b,c);e=e?e+h:h}return e}for(e=0;e<g;e++)a(this[e],b,c);return this}});q({removeData:gc,on:function(a,b,d,c){if(u(c))throw dc("onargs");if(bc(a)){c=yb(a,!0);var e=c.events,f=c.handle;f||(f=c.handle=gg(a,e));c=0<=b.indexOf(" ")?b.split(" "):[b];for(var g=c.length,h=function(b,c,g){var h=e[b];h||(h=e[b]=[],h.specialHandlerWrapper=c,"$destroy"===b||g||a.addEventListener(b,f));h.push(d)};g--;)b=c[g],zb[b]?(h(zb[b],ig),h(b,void 0,!0)):h(b)}},
+off:fd,one:function(a,b,d){a=B(a);a.on(b,function e(){a.off(b,d);a.off(b,e)});a.on(b,d)},replaceWith:function(a,b){var d,c=a.parentNode;xb(a);q(new W(b),function(b){d?c.insertBefore(b,d.nextSibling):c.replaceChild(b,a);d=b})},children:function(a){var b=[];q(a.childNodes,function(a){1===a.nodeType&&b.push(a)});return b},contents:function(a){return a.contentDocument||a.childNodes||[]},append:function(a,b){var d=a.nodeType;if(1===d||11===d){b=new W(b);for(var d=0,c=b.length;d<c;d++)a.appendChild(b[d])}},
+prepend:function(a,b){if(1===a.nodeType){var d=a.firstChild;q(new W(b),function(b){a.insertBefore(b,d)})}},wrap:function(a,b){var d=B(b).eq(0).clone()[0],c=a.parentNode;c&&c.replaceChild(d,a);d.appendChild(a)},remove:Eb,detach:function(a){Eb(a,!0)},after:function(a,b){var d=a,c=a.parentNode;if(c){b=new W(b);for(var e=0,f=b.length;e<f;e++){var g=b[e];c.insertBefore(g,d.nextSibling);d=g}}},addClass:Cb,removeClass:Bb,toggleClass:function(a,b,d){b&&q(b.split(" "),function(b){var e=d;w(e)&&(e=!Ab(a,b));
+(e?Cb:Bb)(a,b)})},parent:function(a){return(a=a.parentNode)&&11!==a.nodeType?a:null},next:function(a){return a.nextElementSibling},find:function(a,b){return a.getElementsByTagName?a.getElementsByTagName(b):[]},clone:fc,triggerHandler:function(a,b,d){var c,e,f=b.type||b,g=yb(a);if(g=(g=g&&g.events)&&g[f])c={preventDefault:function(){this.defaultPrevented=!0},isDefaultPrevented:function(){return!0===this.defaultPrevented},stopImmediatePropagation:function(){this.immediatePropagationStopped=!0},isImmediatePropagationStopped:function(){return!0===
+this.immediatePropagationStopped},stopPropagation:z,type:f,target:a},b.type&&(c=S(c,b)),b=pa(g),e=d?[c].concat(d):[c],q(b,function(b){c.isImmediatePropagationStopped()||b.apply(a,e)})}},function(a,b){W.prototype[b]=function(b,c,e){for(var f,g=0,h=this.length;g<h;g++)w(f)?(f=a(this[g],b,c,e),u(f)&&(f=B(f))):ec(f,a(this[g],b,c,e));return u(f)?f:this}});W.prototype.bind=W.prototype.on;W.prototype.unbind=W.prototype.off;var Vg=Object.create(null);kd.prototype={_idx:function(a){if(a===this._lastKey)return this._lastIndex;
+this._lastKey=a;return this._lastIndex=this._keys.indexOf(a)},_transformKey:function(a){return da(a)?Vg:a},get:function(a){a=this._transformKey(a);a=this._idx(a);if(-1!==a)return this._values[a]},set:function(a,b){a=this._transformKey(a);var d=this._idx(a);-1===d&&(d=this._lastIndex=this._keys.length);this._keys[d]=a;this._values[d]=b},delete:function(a){a=this._transformKey(a);a=this._idx(a);if(-1===a)return!1;this._keys.splice(a,1);this._values.splice(a,1);this._lastKey=NaN;this._lastIndex=-1;return!0}};
+var Gb=kd,Zf=[function(){this.$get=[function(){return Gb}]}],lg=/^([^(]+?)=>/,mg=/^[^(]*\(\s*([^)]*)\)/m,Wg=/,/,Xg=/^\s*(_?)(\S+?)\1\s*$/,kg=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg,ya=L("$injector");eb.$$annotate=function(a,b,d){var c;if("function"===typeof a){if(!(c=a.$inject)){c=[];if(a.length){if(b)throw F(d)&&d||(d=a.name||ng(a)),ya("strictdi",d);b=ld(a);q(b[1].split(Wg),function(a){a.replace(Xg,function(a,b,d){c.push(d)})})}a.$inject=c}}else H(a)?(b=a.length-1,sb(a[b],"fn"),c=a.slice(0,b)):sb(a,"fn",
+!0);return c};var fe=L("$animate"),qf=function(){this.$get=z},rf=function(){var a=new Gb,b=[];this.$get=["$$AnimateRunner","$rootScope",function(d,c){function e(a,b,c){var d=!1;b&&(b=F(b)?b.split(" "):H(b)?b:[],q(b,function(b){b&&(d=!0,a[b]=c)}));return d}function f(){q(b,function(b){var c=a.get(b);if(c){var d=og(b.attr("class")),e="",f="";q(c,function(a,b){a!==!!d[b]&&(a?e+=(e.length?" ":"")+b:f+=(f.length?" ":"")+b)});q(b,function(a){e&&Cb(a,e);f&&Bb(a,f)});a.delete(b)}});b.length=0}return{enabled:z,
+on:z,off:z,pin:z,push:function(g,h,k,l){l&&l();k=k||{};k.from&&g.css(k.from);k.to&&g.css(k.to);if(k.addClass||k.removeClass)if(h=k.addClass,l=k.removeClass,k=a.get(g)||{},h=e(k,h,!0),l=e(k,l,!1),h||l)a.set(g,k),b.push(g),1===b.length&&c.$$postDigest(f);g=new d;g.complete();return g}}}]},of=["$provide",function(a){var b=this,d=null;this.$$registeredAnimations=Object.create(null);this.register=function(c,d){if(c&&"."!==c.charAt(0))throw fe("notcsel",c);var f=c+"-animation";b.$$registeredAnimations[c.substr(1)]=
+f;a.factory(f,d)};this.classNameFilter=function(a){if(1===arguments.length&&(d=a instanceof RegExp?a:null)&&/[(\s|\/)]ng-animate[(\s|\/)]/.test(d.toString()))throw d=null,fe("nongcls","ng-animate");return d};this.$get=["$$animateQueue",function(a){function b(a,c,d){if(d){var e;a:{for(e=0;e<d.length;e++){var l=d[e];if(1===l.nodeType){e=l;break a}}e=void 0}!e||e.parentNode||e.previousElementSibling||(d=null)}d?d.after(a):c.prepend(a)}return{on:a.on,off:a.off,pin:a.pin,enabled:a.enabled,cancel:function(a){a.end&&
+a.end()},enter:function(d,g,h,k){g=g&&B(g);h=h&&B(h);g=g||h.parent();b(d,g,h);return a.push(d,"enter",ia(k))},move:function(d,g,h,k){g=g&&B(g);h=h&&B(h);g=g||h.parent();b(d,g,h);return a.push(d,"move",ia(k))},leave:function(b,d){return a.push(b,"leave",ia(d),function(){b.remove()})},addClass:function(b,d,e){e=ia(e);e.addClass=ib(e.addclass,d);return a.push(b,"addClass",e)},removeClass:function(b,d,e){e=ia(e);e.removeClass=ib(e.removeClass,d);return a.push(b,"removeClass",e)},setClass:function(b,d,
+e,k){k=ia(k);k.addClass=ib(k.addClass,d);k.removeClass=ib(k.removeClass,e);return a.push(b,"setClass",k)},animate:function(b,d,e,k,l){l=ia(l);l.from=l.from?S(l.from,d):d;l.to=l.to?S(l.to,e):e;l.tempClasses=ib(l.tempClasses,k||"ng-inline-animate");return a.push(b,"animate",l)}}}]}],tf=function(){this.$get=["$$rAF",function(a){function b(b){d.push(b);1<d.length||a(function(){for(var a=0;a<d.length;a++)d[a]();d=[]})}var d=[];return function(){var a=!1;b(function(){a=!0});return function(d){a?d():b(d)}}}]},
+sf=function(){this.$get=["$q","$sniffer","$$animateAsyncRun","$$isDocumentHidden","$timeout",function(a,b,d,c,e){function f(a){this.setHost(a);var b=d();this._doneCallbacks=[];this._tick=function(a){c()?e(a,0,!1):b(a)};this._state=0}f.chain=function(a,b){function c(){if(d===a.length)b(!0);else a[d](function(a){!1===a?b(!1):(d++,c())})}var d=0;c()};f.all=function(a,b){function c(f){e=e&&f;++d===a.length&&b(e)}var d=0,e=!0;q(a,function(a){a.done(c)})};f.prototype={setHost:function(a){this.host=a||{}},
+done:function(a){2===this._state?a():this._doneCallbacks.push(a)},progress:z,getPromise:function(){if(!this.promise){var b=this;this.promise=a(function(a,c){b.done(function(b){!1===b?c():a()})})}return this.promise},then:function(a,b){return this.getPromise().then(a,b)},"catch":function(a){return this.getPromise()["catch"](a)},"finally":function(a){return this.getPromise()["finally"](a)},pause:function(){this.host.pause&&this.host.pause()},resume:function(){this.host.resume&&this.host.resume()},end:function(){this.host.end&&
+this.host.end();this._resolve(!0)},cancel:function(){this.host.cancel&&this.host.cancel();this._resolve(!1)},complete:function(a){var b=this;0===b._state&&(b._state=1,b._tick(function(){b._resolve(a)}))},_resolve:function(a){2!==this._state&&(q(this._doneCallbacks,function(b){b(a)}),this._doneCallbacks.length=0,this._state=2)}};return f}]},pf=function(){this.$get=["$$rAF","$q","$$AnimateRunner",function(a,b,d){return function(b,e){function f(){a(function(){g.addClass&&(b.addClass(g.addClass),g.addClass=
+null);g.removeClass&&(b.removeClass(g.removeClass),g.removeClass=null);g.to&&(b.css(g.to),g.to=null);h||k.complete();h=!0});return k}var g=e||{};g.$$prepared||(g=ra(g));g.cleanupStyles&&(g.from=g.to=null);g.from&&(b.css(g.from),g.from=null);var h,k=new d;return{start:f,end:f}}}]},fa=L("$compile"),lc=new function(){};Wc.$inject=["$provide","$$sanitizeUriProvider"];Ib.prototype.isFirstChange=function(){return this.previousValue===lc};var md=/^((?:x|data)[:\-_])/i,rg=/[:\-_]+(.)/g,td=L("$controller"),
+sd=/^(\S+)(\s+as\s+([\w$]+))?$/,Af=function(){this.$get=["$document",function(a){return function(b){b?!b.nodeType&&b instanceof B&&(b=b[0]):b=a[0].body;return b.offsetWidth+1}}]},ud="application/json",pc={"Content-Type":ud+";charset=utf-8"},ug=/^\[|^\{(?!\{)/,vg={"[":/]$/,"{":/}$/},tg=/^\)]\}',?\n/,oc=L("$http"),Da=ea.$interpolateMinErr=L("$interpolate");Da.throwNoconcat=function(a){throw Da("noconcat",a);};Da.interr=function(a,b){return Da("interr",a,b.toString())};var If=function(){this.$get=function(){function a(a){var b=
+function(a){b.data=a;b.called=!0};b.id=a;return b}var b=ea.callbacks,d={};return{createCallback:function(c){c="_"+(b.$$counter++).toString(36);var e="angular.callbacks."+c,f=a(c);d[e]=b[c]=f;return e},wasCalled:function(a){return d[a].called},getResponse:function(a){return d[a].data},removeCallback:function(a){delete b[d[a].id];delete d[a]}}}},Yg=/^([^?#]*)(\?([^#]*))?(#(.*))?$/,xg={http:80,https:443,ftp:21},kb=L("$location"),yg=/^\s*[\\/]{2,}/,Zg={$$absUrl:"",$$html5:!1,$$replace:!1,absUrl:Jb("$$absUrl"),
+url:function(a){if(w(a))return this.$$url;var b=Yg.exec(a);(b[1]||""===a)&&this.path(decodeURIComponent(b[1]));(b[2]||b[1]||""===a)&&this.search(b[3]||"");this.hash(b[5]||"");return this},protocol:Jb("$$protocol"),host:Jb("$$host"),port:Jb("$$port"),path:Cd("$$path",function(a){a=null!==a?a.toString():"";return"/"===a.charAt(0)?a:"/"+a}),search:function(a,b){switch(arguments.length){case 0:return this.$$search;case 1:if(F(a)||ba(a))a=a.toString(),this.$$search=Rc(a);else if(C(a))a=ra(a,{}),q(a,function(b,
+c){null==b&&delete a[c]}),this.$$search=a;else throw kb("isrcharg");break;default:w(b)||null===b?delete this.$$search[a]:this.$$search[a]=b}this.$$compose();return this},hash:Cd("$$hash",function(a){return null!==a?a.toString():""}),replace:function(){this.$$replace=!0;return this}};q([Bd,tc,sc],function(a){a.prototype=Object.create(Zg);a.prototype.state=function(b){if(!arguments.length)return this.$$state;if(a!==sc||!this.$$html5)throw kb("nostate");this.$$state=w(b)?null:b;this.$$urlUpdatedByLocation=
+!0;return this}});var Ua=L("$parse"),Bg={}.constructor.prototype.valueOf,Qb=V();q("+ - * / % === !== == != < > <= >= && || ! = |".split(" "),function(a){Qb[a]=!0});var $g={n:"\n",f:"\f",r:"\r",t:"\t",v:"\v","'":"'",'"':'"'},wc=function(a){this.options=a};wc.prototype={constructor:wc,lex:function(a){this.text=a;this.index=0;for(this.tokens=[];this.index<this.text.length;)if(a=this.text.charAt(this.index),'"'===a||"'"===a)this.readString(a);else if(this.isNumber(a)||"."===a&&this.isNumber(this.peek()))this.readNumber();
+else if(this.isIdentifierStart(this.peekMultichar()))this.readIdent();else if(this.is(a,"(){}[].,;:?"))this.tokens.push({index:this.index,text:a}),this.index++;else if(this.isWhitespace(a))this.index++;else{var b=a+this.peek(),d=b+this.peek(2),c=Qb[b],e=Qb[d];Qb[a]||c||e?(a=e?d:c?b:a,this.tokens.push({index:this.index,text:a,operator:!0}),this.index+=a.length):this.throwError("Unexpected next character ",this.index,this.index+1)}return this.tokens},is:function(a,b){return-1!==b.indexOf(a)},peek:function(a){a=
+a||1;return this.index+a<this.text.length?this.text.charAt(this.index+a):!1},isNumber:function(a){return"0"<=a&&"9">=a&&"string"===typeof a},isWhitespace:function(a){return" "===a||"\r"===a||"\t"===a||"\n"===a||"\v"===a||"\u00a0"===a},isIdentifierStart:function(a){return this.options.isIdentifierStart?this.options.isIdentifierStart(a,this.codePointAt(a)):this.isValidIdentifierStart(a)},isValidIdentifierStart:function(a){return"a"<=a&&"z">=a||"A"<=a&&"Z">=a||"_"===a||"$"===a},isIdentifierContinue:function(a){return this.options.isIdentifierContinue?
+this.options.isIdentifierContinue(a,this.codePointAt(a)):this.isValidIdentifierContinue(a)},isValidIdentifierContinue:function(a,b){return this.isValidIdentifierStart(a,b)||this.isNumber(a)},codePointAt:function(a){return 1===a.length?a.charCodeAt(0):(a.charCodeAt(0)<<10)+a.charCodeAt(1)-56613888},peekMultichar:function(){var a=this.text.charAt(this.index),b=this.peek();if(!b)return a;var d=a.charCodeAt(0),c=b.charCodeAt(0);return 55296<=d&&56319>=d&&56320<=c&&57343>=c?a+b:a},isExpOperator:function(a){return"-"===
+a||"+"===a||this.isNumber(a)},throwError:function(a,b,d){d=d||this.index;b=u(b)?"s "+b+"-"+this.index+" ["+this.text.substring(b,d)+"]":" "+d;throw Ua("lexerr",a,b,this.text);},readNumber:function(){for(var a="",b=this.index;this.index<this.text.length;){var d=Q(this.text.charAt(this.index));if("."===d||this.isNumber(d))a+=d;else{var c=this.peek();if("e"===d&&this.isExpOperator(c))a+=d;else if(this.isExpOperator(d)&&c&&this.isNumber(c)&&"e"===a.charAt(a.length-1))a+=d;else if(!this.isExpOperator(d)||
+c&&this.isNumber(c)||"e"!==a.charAt(a.length-1))break;else this.throwError("Invalid exponent")}this.index++}this.tokens.push({index:b,text:a,constant:!0,value:Number(a)})},readIdent:function(){var a=this.index;for(this.index+=this.peekMultichar().length;this.index<this.text.length;){var b=this.peekMultichar();if(!this.isIdentifierContinue(b))break;this.index+=b.length}this.tokens.push({index:a,text:this.text.slice(a,this.index),identifier:!0})},readString:function(a){var b=this.index;this.index++;
+for(var d="",c=a,e=!1;this.index<this.text.length;){var f=this.text.charAt(this.index),c=c+f;if(e)"u"===f?(e=this.text.substring(this.index+1,this.index+5),e.match(/[\da-f]{4}/i)||this.throwError("Invalid unicode escape [\\u"+e+"]"),this.index+=4,d+=String.fromCharCode(parseInt(e,16))):d+=$g[f]||f,e=!1;else if("\\"===f)e=!0;else{if(f===a){this.index++;this.tokens.push({index:b,text:c,constant:!0,value:d});return}d+=f}this.index++}this.throwError("Unterminated quote",b)}};var s=function(a,b){this.lexer=
+a;this.options=b};s.Program="Program";s.ExpressionStatement="ExpressionStatement";s.AssignmentExpression="AssignmentExpression";s.ConditionalExpression="ConditionalExpression";s.LogicalExpression="LogicalExpression";s.BinaryExpression="BinaryExpression";s.UnaryExpression="UnaryExpression";s.CallExpression="CallExpression";s.MemberExpression="MemberExpression";s.Identifier="Identifier";s.Literal="Literal";s.ArrayExpression="ArrayExpression";s.Property="Property";s.ObjectExpression="ObjectExpression";
+s.ThisExpression="ThisExpression";s.LocalsExpression="LocalsExpression";s.NGValueParameter="NGValueParameter";s.prototype={ast:function(a){this.text=a;this.tokens=this.lexer.lex(a);a=this.program();0!==this.tokens.length&&this.throwError("is an unexpected token",this.tokens[0]);return a},program:function(){for(var a=[];;)if(0<this.tokens.length&&!this.peek("}",")",";","]")&&a.push(this.expressionStatement()),!this.expect(";"))return{type:s.Program,body:a}},expressionStatement:function(){return{type:s.ExpressionStatement,
+expression:this.filterChain()}},filterChain:function(){for(var a=this.expression();this.expect("|");)a=this.filter(a);return a},expression:function(){return this.assignment()},assignment:function(){var a=this.ternary();if(this.expect("=")){if(!Fd(a))throw Ua("lval");a={type:s.AssignmentExpression,left:a,right:this.assignment(),operator:"="}}return a},ternary:function(){var a=this.logicalOR(),b,d;return this.expect("?")&&(b=this.expression(),this.consume(":"))?(d=this.expression(),{type:s.ConditionalExpression,
+test:a,alternate:b,consequent:d}):a},logicalOR:function(){for(var a=this.logicalAND();this.expect("||");)a={type:s.LogicalExpression,operator:"||",left:a,right:this.logicalAND()};return a},logicalAND:function(){for(var a=this.equality();this.expect("&&");)a={type:s.LogicalExpression,operator:"&&",left:a,right:this.equality()};return a},equality:function(){for(var a=this.relational(),b;b=this.expect("==","!=","===","!==");)a={type:s.BinaryExpression,operator:b.text,left:a,right:this.relational()};
+return a},relational:function(){for(var a=this.additive(),b;b=this.expect("<",">","<=",">=");)a={type:s.BinaryExpression,operator:b.text,left:a,right:this.additive()};return a},additive:function(){for(var a=this.multiplicative(),b;b=this.expect("+","-");)a={type:s.BinaryExpression,operator:b.text,left:a,right:this.multiplicative()};return a},multiplicative:function(){for(var a=this.unary(),b;b=this.expect("*","/","%");)a={type:s.BinaryExpression,operator:b.text,left:a,right:this.unary()};return a},
+unary:function(){var a;return(a=this.expect("+","-","!"))?{type:s.UnaryExpression,operator:a.text,prefix:!0,argument:this.unary()}:this.primary()},primary:function(){var a;this.expect("(")?(a=this.filterChain(),this.consume(")")):this.expect("[")?a=this.arrayDeclaration():this.expect("{")?a=this.object():this.selfReferential.hasOwnProperty(this.peek().text)?a=ra(this.selfReferential[this.consume().text]):this.options.literals.hasOwnProperty(this.peek().text)?a={type:s.Literal,value:this.options.literals[this.consume().text]}:
+this.peek().identifier?a=this.identifier():this.peek().constant?a=this.constant():this.throwError("not a primary expression",this.peek());for(var b;b=this.expect("(","[",".");)"("===b.text?(a={type:s.CallExpression,callee:a,arguments:this.parseArguments()},this.consume(")")):"["===b.text?(a={type:s.MemberExpression,object:a,property:this.expression(),computed:!0},this.consume("]")):"."===b.text?a={type:s.MemberExpression,object:a,property:this.identifier(),computed:!1}:this.throwError("IMPOSSIBLE");
+return a},filter:function(a){a=[a];for(var b={type:s.CallExpression,callee:this.identifier(),arguments:a,filter:!0};this.expect(":");)a.push(this.expression());return b},parseArguments:function(){var a=[];if(")"!==this.peekToken().text){do a.push(this.filterChain());while(this.expect(","))}return a},identifier:function(){var a=this.consume();a.identifier||this.throwError("is not a valid identifier",a);return{type:s.Identifier,name:a.text}},constant:function(){return{type:s.Literal,value:this.consume().value}},
+arrayDeclaration:function(){var a=[];if("]"!==this.peekToken().text){do{if(this.peek("]"))break;a.push(this.expression())}while(this.expect(","))}this.consume("]");return{type:s.ArrayExpression,elements:a}},object:function(){var a=[],b;if("}"!==this.peekToken().text){do{if(this.peek("}"))break;b={type:s.Property,kind:"init"};this.peek().constant?(b.key=this.constant(),b.computed=!1,this.consume(":"),b.value=this.expression()):this.peek().identifier?(b.key=this.identifier(),b.computed=!1,this.peek(":")?
+(this.consume(":"),b.value=this.expression()):b.value=b.key):this.peek("[")?(this.consume("["),b.key=this.expression(),this.consume("]"),b.computed=!0,this.consume(":"),b.value=this.expression()):this.throwError("invalid key",this.peek());a.push(b)}while(this.expect(","))}this.consume("}");return{type:s.ObjectExpression,properties:a}},throwError:function(a,b){throw Ua("syntax",b.text,a,b.index+1,this.text,this.text.substring(b.index));},consume:function(a){if(0===this.tokens.length)throw Ua("ueoe",
+this.text);var b=this.expect(a);b||this.throwError("is unexpected, expecting ["+a+"]",this.peek());return b},peekToken:function(){if(0===this.tokens.length)throw Ua("ueoe",this.text);return this.tokens[0]},peek:function(a,b,d,c){return this.peekAhead(0,a,b,d,c)},peekAhead:function(a,b,d,c,e){if(this.tokens.length>a){a=this.tokens[a];var f=a.text;if(f===b||f===d||f===c||f===e||!(b||d||c||e))return a}return!1},expect:function(a,b,d,c){return(a=this.peek(a,b,d,c))?(this.tokens.shift(),a):!1},selfReferential:{"this":{type:s.ThisExpression},
+$locals:{type:s.LocalsExpression}}};Hd.prototype={compile:function(a){var b=this;this.state={nextId:0,filters:{},fn:{vars:[],body:[],own:{}},assign:{vars:[],body:[],own:{}},inputs:[]};U(a,b.$filter);var d="",c;this.stage="assign";if(c=Gd(a))this.state.computing="assign",d=this.nextId(),this.recurse(c,d),this.return_(d),d="fn.assign="+this.generateFunction("assign","s,v,l");c=Ed(a.body);b.stage="inputs";q(c,function(a,c){var d="fn"+c;b.state[d]={vars:[],body:[],own:{}};b.state.computing=d;var h=b.nextId();
+b.recurse(a,h);b.return_(h);b.state.inputs.push(d);a.watchId=c});this.state.computing="fn";this.stage="main";this.recurse(a);a='"'+this.USE+" "+this.STRICT+'";\n'+this.filterPrefix()+"var fn="+this.generateFunction("fn","s,l,a,i")+d+this.watchFns()+"return fn;";a=(new Function("$filter","getStringValue","ifDefined","plus",a))(this.$filter,zg,Ag,Dd);this.state=this.stage=void 0;return a},USE:"use",STRICT:"strict",watchFns:function(){var a=[],b=this.state.inputs,d=this;q(b,function(b){a.push("var "+
+b+"="+d.generateFunction(b,"s"))});b.length&&a.push("fn.inputs=["+b.join(",")+"];");return a.join("")},generateFunction:function(a,b){return"function("+b+"){"+this.varsPrefix(a)+this.body(a)+"};"},filterPrefix:function(){var a=[],b=this;q(this.state.filters,function(d,c){a.push(d+"=$filter("+b.escape(c)+")")});return a.length?"var "+a.join(",")+";":""},varsPrefix:function(a){return this.state[a].vars.length?"var "+this.state[a].vars.join(",")+";":""},body:function(a){return this.state[a].body.join("")},
+recurse:function(a,b,d,c,e,f){var g,h,k=this,l,m,n;c=c||z;if(!f&&u(a.watchId))b=b||this.nextId(),this.if_("i",this.lazyAssign(b,this.computedMember("i",a.watchId)),this.lazyRecurse(a,b,d,c,e,!0));else switch(a.type){case s.Program:q(a.body,function(b,c){k.recurse(b.expression,void 0,void 0,function(a){h=a});c!==a.body.length-1?k.current().body.push(h,";"):k.return_(h)});break;case s.Literal:m=this.escape(a.value);this.assign(b,m);c(b||m);break;case s.UnaryExpression:this.recurse(a.argument,void 0,
+void 0,function(a){h=a});m=a.operator+"("+this.ifDefined(h,0)+")";this.assign(b,m);c(m);break;case s.BinaryExpression:this.recurse(a.left,void 0,void 0,function(a){g=a});this.recurse(a.right,void 0,void 0,function(a){h=a});m="+"===a.operator?this.plus(g,h):"-"===a.operator?this.ifDefined(g,0)+a.operator+this.ifDefined(h,0):"("+g+")"+a.operator+"("+h+")";this.assign(b,m);c(m);break;case s.LogicalExpression:b=b||this.nextId();k.recurse(a.left,b);k.if_("&&"===a.operator?b:k.not(b),k.lazyRecurse(a.right,
+b));c(b);break;case s.ConditionalExpression:b=b||this.nextId();k.recurse(a.test,b);k.if_(b,k.lazyRecurse(a.alternate,b),k.lazyRecurse(a.consequent,b));c(b);break;case s.Identifier:b=b||this.nextId();d&&(d.context="inputs"===k.stage?"s":this.assign(this.nextId(),this.getHasOwnProperty("l",a.name)+"?l:s"),d.computed=!1,d.name=a.name);k.if_("inputs"===k.stage||k.not(k.getHasOwnProperty("l",a.name)),function(){k.if_("inputs"===k.stage||"s",function(){e&&1!==e&&k.if_(k.isNull(k.nonComputedMember("s",a.name)),
+k.lazyAssign(k.nonComputedMember("s",a.name),"{}"));k.assign(b,k.nonComputedMember("s",a.name))})},b&&k.lazyAssign(b,k.nonComputedMember("l",a.name)));c(b);break;case s.MemberExpression:g=d&&(d.context=this.nextId())||this.nextId();b=b||this.nextId();k.recurse(a.object,g,void 0,function(){k.if_(k.notNull(g),function(){a.computed?(h=k.nextId(),k.recurse(a.property,h),k.getStringValue(h),e&&1!==e&&k.if_(k.not(k.computedMember(g,h)),k.lazyAssign(k.computedMember(g,h),"{}")),m=k.computedMember(g,h),k.assign(b,
+m),d&&(d.computed=!0,d.name=h)):(e&&1!==e&&k.if_(k.isNull(k.nonComputedMember(g,a.property.name)),k.lazyAssign(k.nonComputedMember(g,a.property.name),"{}")),m=k.nonComputedMember(g,a.property.name),k.assign(b,m),d&&(d.computed=!1,d.name=a.property.name))},function(){k.assign(b,"undefined")});c(b)},!!e);break;case s.CallExpression:b=b||this.nextId();a.filter?(h=k.filter(a.callee.name),l=[],q(a.arguments,function(a){var b=k.nextId();k.recurse(a,b);l.push(b)}),m=h+"("+l.join(",")+")",k.assign(b,m),c(b)):
+(h=k.nextId(),g={},l=[],k.recurse(a.callee,h,g,function(){k.if_(k.notNull(h),function(){q(a.arguments,function(b){k.recurse(b,a.constant?void 0:k.nextId(),void 0,function(a){l.push(a)})});m=g.name?k.member(g.context,g.name,g.computed)+"("+l.join(",")+")":h+"("+l.join(",")+")";k.assign(b,m)},function(){k.assign(b,"undefined")});c(b)}));break;case s.AssignmentExpression:h=this.nextId();g={};this.recurse(a.left,void 0,g,function(){k.if_(k.notNull(g.context),function(){k.recurse(a.right,h);m=k.member(g.context,
+g.name,g.computed)+a.operator+h;k.assign(b,m);c(b||m)})},1);break;case s.ArrayExpression:l=[];q(a.elements,function(b){k.recurse(b,a.constant?void 0:k.nextId(),void 0,function(a){l.push(a)})});m="["+l.join(",")+"]";this.assign(b,m);c(b||m);break;case s.ObjectExpression:l=[];n=!1;q(a.properties,function(a){a.computed&&(n=!0)});n?(b=b||this.nextId(),this.assign(b,"{}"),q(a.properties,function(a){a.computed?(g=k.nextId(),k.recurse(a.key,g)):g=a.key.type===s.Identifier?a.key.name:""+a.key.value;h=k.nextId();
+k.recurse(a.value,h);k.assign(k.member(b,g,a.computed),h)})):(q(a.properties,function(b){k.recurse(b.value,a.constant?void 0:k.nextId(),void 0,function(a){l.push(k.escape(b.key.type===s.Identifier?b.key.name:""+b.key.value)+":"+a)})}),m="{"+l.join(",")+"}",this.assign(b,m));c(b||m);break;case s.ThisExpression:this.assign(b,"s");c(b||"s");break;case s.LocalsExpression:this.assign(b,"l");c(b||"l");break;case s.NGValueParameter:this.assign(b,"v"),c(b||"v")}},getHasOwnProperty:function(a,b){var d=a+"."+
+b,c=this.current().own;c.hasOwnProperty(d)||(c[d]=this.nextId(!1,a+"&&("+this.escape(b)+" in "+a+")"));return c[d]},assign:function(a,b){if(a)return this.current().body.push(a,"=",b,";"),a},filter:function(a){this.state.filters.hasOwnProperty(a)||(this.state.filters[a]=this.nextId(!0));return this.state.filters[a]},ifDefined:function(a,b){return"ifDefined("+a+","+this.escape(b)+")"},plus:function(a,b){return"plus("+a+","+b+")"},return_:function(a){this.current().body.push("return ",a,";")},if_:function(a,
+b,d){if(!0===a)b();else{var c=this.current().body;c.push("if(",a,"){");b();c.push("}");d&&(c.push("else{"),d(),c.push("}"))}},not:function(a){return"!("+a+")"},isNull:function(a){return a+"==null"},notNull:function(a){return a+"!=null"},nonComputedMember:function(a,b){var d=/[^$_a-zA-Z0-9]/g;return/^[$_a-zA-Z][$_a-zA-Z0-9]*$/.test(b)?a+"."+b:a+'["'+b.replace(d,this.stringEscapeFn)+'"]'},computedMember:function(a,b){return a+"["+b+"]"},member:function(a,b,d){return d?this.computedMember(a,b):this.nonComputedMember(a,
+b)},getStringValue:function(a){this.assign(a,"getStringValue("+a+")")},lazyRecurse:function(a,b,d,c,e,f){var g=this;return function(){g.recurse(a,b,d,c,e,f)}},lazyAssign:function(a,b){var d=this;return function(){d.assign(a,b)}},stringEscapeRegex:/[^ a-zA-Z0-9]/g,stringEscapeFn:function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)},escape:function(a){if(F(a))return"'"+a.replace(this.stringEscapeRegex,this.stringEscapeFn)+"'";if(ba(a))return a.toString();if(!0===a)return"true";if(!1===
+a)return"false";if(null===a)return"null";if("undefined"===typeof a)return"undefined";throw Ua("esc");},nextId:function(a,b){var d="v"+this.state.nextId++;a||this.current().vars.push(d+(b?"="+b:""));return d},current:function(){return this.state[this.state.computing]}};Id.prototype={compile:function(a){var b=this;U(a,b.$filter);var d,c;if(d=Gd(a))c=this.recurse(d);d=Ed(a.body);var e;d&&(e=[],q(d,function(a,c){var d=b.recurse(a);a.input=d;e.push(d);a.watchId=c}));var f=[];q(a.body,function(a){f.push(b.recurse(a.expression))});
+a=0===a.body.length?z:1===a.body.length?f[0]:function(a,b){var c;q(f,function(d){c=d(a,b)});return c};c&&(a.assign=function(a,b,d){return c(a,d,b)});e&&(a.inputs=e);return a},recurse:function(a,b,d){var c,e,f=this,g;if(a.input)return this.inputs(a.input,a.watchId);switch(a.type){case s.Literal:return this.value(a.value,b);case s.UnaryExpression:return e=this.recurse(a.argument),this["unary"+a.operator](e,b);case s.BinaryExpression:return c=this.recurse(a.left),e=this.recurse(a.right),this["binary"+
+a.operator](c,e,b);case s.LogicalExpression:return c=this.recurse(a.left),e=this.recurse(a.right),this["binary"+a.operator](c,e,b);case s.ConditionalExpression:return this["ternary?:"](this.recurse(a.test),this.recurse(a.alternate),this.recurse(a.consequent),b);case s.Identifier:return f.identifier(a.name,b,d);case s.MemberExpression:return c=this.recurse(a.object,!1,!!d),a.computed||(e=a.property.name),a.computed&&(e=this.recurse(a.property)),a.computed?this.computedMember(c,e,b,d):this.nonComputedMember(c,
+e,b,d);case s.CallExpression:return g=[],q(a.arguments,function(a){g.push(f.recurse(a))}),a.filter&&(e=this.$filter(a.callee.name)),a.filter||(e=this.recurse(a.callee,!0)),a.filter?function(a,c,d,f){for(var n=[],p=0;p<g.length;++p)n.push(g[p](a,c,d,f));a=e.apply(void 0,n,f);return b?{context:void 0,name:void 0,value:a}:a}:function(a,c,d,f){var n=e(a,c,d,f),p;if(null!=n.value){p=[];for(var r=0;r<g.length;++r)p.push(g[r](a,c,d,f));p=n.value.apply(n.context,p)}return b?{value:p}:p};case s.AssignmentExpression:return c=
+this.recurse(a.left,!0,1),e=this.recurse(a.right),function(a,d,f,g){var n=c(a,d,f,g);a=e(a,d,f,g);n.context[n.name]=a;return b?{value:a}:a};case s.ArrayExpression:return g=[],q(a.elements,function(a){g.push(f.recurse(a))}),function(a,c,d,e){for(var f=[],p=0;p<g.length;++p)f.push(g[p](a,c,d,e));return b?{value:f}:f};case s.ObjectExpression:return g=[],q(a.properties,function(a){a.computed?g.push({key:f.recurse(a.key),computed:!0,value:f.recurse(a.value)}):g.push({key:a.key.type===s.Identifier?a.key.name:
+""+a.key.value,computed:!1,value:f.recurse(a.value)})}),function(a,c,d,e){for(var f={},p=0;p<g.length;++p)g[p].computed?f[g[p].key(a,c,d,e)]=g[p].value(a,c,d,e):f[g[p].key]=g[p].value(a,c,d,e);return b?{value:f}:f};case s.ThisExpression:return function(a){return b?{value:a}:a};case s.LocalsExpression:return function(a,c){return b?{value:c}:c};case s.NGValueParameter:return function(a,c,d){return b?{value:d}:d}}},"unary+":function(a,b){return function(d,c,e,f){d=a(d,c,e,f);d=u(d)?+d:0;return b?{value:d}:
+d}},"unary-":function(a,b){return function(d,c,e,f){d=a(d,c,e,f);d=u(d)?-d:-0;return b?{value:d}:d}},"unary!":function(a,b){return function(d,c,e,f){d=!a(d,c,e,f);return b?{value:d}:d}},"binary+":function(a,b,d){return function(c,e,f,g){var h=a(c,e,f,g);c=b(c,e,f,g);h=Dd(h,c);return d?{value:h}:h}},"binary-":function(a,b,d){return function(c,e,f,g){var h=a(c,e,f,g);c=b(c,e,f,g);h=(u(h)?h:0)-(u(c)?c:0);return d?{value:h}:h}},"binary*":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)*b(c,e,f,g);
+return d?{value:c}:c}},"binary/":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)/b(c,e,f,g);return d?{value:c}:c}},"binary%":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)%b(c,e,f,g);return d?{value:c}:c}},"binary===":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)===b(c,e,f,g);return d?{value:c}:c}},"binary!==":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)!==b(c,e,f,g);return d?{value:c}:c}},"binary==":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)==b(c,e,f,g);return d?
+{value:c}:c}},"binary!=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)!=b(c,e,f,g);return d?{value:c}:c}},"binary<":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)<b(c,e,f,g);return d?{value:c}:c}},"binary>":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)>b(c,e,f,g);return d?{value:c}:c}},"binary<=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)<=b(c,e,f,g);return d?{value:c}:c}},"binary>=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)>=b(c,e,f,g);return d?{value:c}:
+c}},"binary&&":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)&&b(c,e,f,g);return d?{value:c}:c}},"binary||":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)||b(c,e,f,g);return d?{value:c}:c}},"ternary?:":function(a,b,d,c){return function(e,f,g,h){e=a(e,f,g,h)?b(e,f,g,h):d(e,f,g,h);return c?{value:e}:e}},value:function(a,b){return function(){return b?{context:void 0,name:void 0,value:a}:a}},identifier:function(a,b,d){return function(c,e,f,g){c=e&&a in e?e:c;d&&1!==d&&c&&null==c[a]&&(c[a]=
+{});e=c?c[a]:void 0;return b?{context:c,name:a,value:e}:e}},computedMember:function(a,b,d,c){return function(e,f,g,h){var k=a(e,f,g,h),l,m;null!=k&&(l=b(e,f,g,h),l+="",c&&1!==c&&k&&!k[l]&&(k[l]={}),m=k[l]);return d?{context:k,name:l,value:m}:m}},nonComputedMember:function(a,b,d,c){return function(e,f,g,h){e=a(e,f,g,h);c&&1!==c&&e&&null==e[b]&&(e[b]={});f=null!=e?e[b]:void 0;return d?{context:e,name:b,value:f}:f}},inputs:function(a,b){return function(d,c,e,f){return f?f[b]:a(d,c,e)}}};uc.prototype=
+{constructor:uc,parse:function(a){a=this.ast.ast(a);var b=this.astCompiler.compile(a);b.literal=0===a.body.length||1===a.body.length&&(a.body[0].expression.type===s.Literal||a.body[0].expression.type===s.ArrayExpression||a.body[0].expression.type===s.ObjectExpression);b.constant=a.constant;return b}};var ta=L("$sce"),oa={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"},xc=/_([a-z])/g,Dg=L("$compile"),aa=x.document.createElement("a"),Md=Ca(x.location.href);Nd.$inject=["$document"];
+cd.$inject=["$provide"];var Ud=22,Td=".",zc="0";Od.$inject=["$locale"];Qd.$inject=["$locale"];var Og={yyyy:Y("FullYear",4,0,!1,!0),yy:Y("FullYear",2,0,!0,!0),y:Y("FullYear",1,0,!1,!0),MMMM:mb("Month"),MMM:mb("Month",!0),MM:Y("Month",2,1),M:Y("Month",1,1),LLLL:mb("Month",!1,!0),dd:Y("Date",2),d:Y("Date",1),HH:Y("Hours",2),H:Y("Hours",1),hh:Y("Hours",2,-12),h:Y("Hours",1,-12),mm:Y("Minutes",2),m:Y("Minutes",1),ss:Y("Seconds",2),s:Y("Seconds",1),sss:Y("Milliseconds",3),EEEE:mb("Day"),EEE:mb("Day",!0),
+a:function(a,b){return 12>a.getHours()?b.AMPMS[0]:b.AMPMS[1]},Z:function(a,b,d){a=-1*d;return a=(0<=a?"+":"")+(Kb(Math[0<a?"floor":"ceil"](a/60),2)+Kb(Math.abs(a%60),2))},ww:Wd(2),w:Wd(1),G:Ac,GG:Ac,GGG:Ac,GGGG:function(a,b){return 0>=a.getFullYear()?b.ERANAMES[0]:b.ERANAMES[1]}},Ng=/((?:[^yMLdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|L+|d+|H+|h+|m+|s+|a|Z|G+|w+))([\s\S]*)/,Mg=/^-?\d+$/;Pd.$inject=["$locale"];var Hg=la(Q),Ig=la(ub);Rd.$inject=["$parse"];var Fe=la({restrict:"E",compile:function(a,
+b){if(!b.href&&!b.xlinkHref)return function(a,b){if("a"===b[0].nodeName.toLowerCase()){var e="[object SVGAnimatedString]"===ma.call(b.prop("href"))?"xlink:href":"href";b.on("click",function(a){b.attr(e)||a.preventDefault()})}}}}),vb={};q(Fb,function(a,b){function d(a,d,e){a.$watch(e[c],function(a){e.$set(b,!!a)})}if("multiple"!==a){var c=Ba("ng-"+b),e=d;"checked"===a&&(e=function(a,b,e){e.ngModel!==e[c]&&d(a,b,e)});vb[c]=function(){return{restrict:"A",priority:100,link:e}}}});q(rd,function(a,b){vb[b]=
+function(){return{priority:100,link:function(a,c,e){if("ngPattern"===b&&"/"===e.ngPattern.charAt(0)&&(c=e.ngPattern.match(Sg))){e.$set("ngPattern",new RegExp(c[1],c[2]));return}a.$watch(e[b],function(a){e.$set(b,a)})}}}});q(["src","srcset","href"],function(a){var b=Ba("ng-"+a);vb[b]=function(){return{priority:99,link:function(d,c,e){var f=a,g=a;"href"===a&&"[object SVGAnimatedString]"===ma.call(c.prop("href"))&&(g="xlinkHref",e.$attr[g]="xlink:href",f=null);e.$observe(b,function(b){b?(e.$set(g,b),
+za&&f&&c.prop(f,e[g])):"href"===a&&e.$set(g,null)})}}}});var Mb={$addControl:z,$$renameControl:function(a,b){a.$name=b},$removeControl:z,$setValidity:z,$setDirty:z,$setPristine:z,$setSubmitted:z};Lb.$inject=["$element","$attrs","$scope","$animate","$interpolate"];Lb.prototype={$rollbackViewValue:function(){q(this.$$controls,function(a){a.$rollbackViewValue()})},$commitViewValue:function(){q(this.$$controls,function(a){a.$commitViewValue()})},$addControl:function(a){Ka(a.$name,"input");this.$$controls.push(a);
+a.$name&&(this[a.$name]=a);a.$$parentForm=this},$$renameControl:function(a,b){var d=a.$name;this[d]===a&&delete this[d];this[b]=a;a.$name=b},$removeControl:function(a){a.$name&&this[a.$name]===a&&delete this[a.$name];q(this.$pending,function(b,d){this.$setValidity(d,null,a)},this);q(this.$error,function(b,d){this.$setValidity(d,null,a)},this);q(this.$$success,function(b,d){this.$setValidity(d,null,a)},this);$a(this.$$controls,a);a.$$parentForm=Mb},$setDirty:function(){this.$$animate.removeClass(this.$$element,
+Va);this.$$animate.addClass(this.$$element,Rb);this.$dirty=!0;this.$pristine=!1;this.$$parentForm.$setDirty()},$setPristine:function(){this.$$animate.setClass(this.$$element,Va,Rb+" ng-submitted");this.$dirty=!1;this.$pristine=!0;this.$submitted=!1;q(this.$$controls,function(a){a.$setPristine()})},$setUntouched:function(){q(this.$$controls,function(a){a.$setUntouched()})},$setSubmitted:function(){this.$$animate.addClass(this.$$element,"ng-submitted");this.$submitted=!0;this.$$parentForm.$setSubmitted()}};
+Zd({clazz:Lb,set:function(a,b,d){var c=a[b];c?-1===c.indexOf(d)&&c.push(d):a[b]=[d]},unset:function(a,b,d){var c=a[b];c&&($a(c,d),0===c.length&&delete a[b])}});var ge=function(a){return["$timeout","$parse",function(b,d){function c(a){return""===a?d('this[""]').assign:d(a).assign||z}return{name:"form",restrict:a?"EAC":"E",require:["form","^^?form"],controller:Lb,compile:function(d,f){d.addClass(Va).addClass(nb);var g=f.name?"name":a&&f.ngForm?"ngForm":!1;return{pre:function(a,d,e,f){var n=f[0];if(!("action"in
+e)){var p=function(b){a.$apply(function(){n.$commitViewValue();n.$setSubmitted()});b.preventDefault()};d[0].addEventListener("submit",p);d.on("$destroy",function(){b(function(){d[0].removeEventListener("submit",p)},0,!1)})}(f[1]||n.$$parentForm).$addControl(n);var r=g?c(n.$name):z;g&&(r(a,n),e.$observe(g,function(b){n.$name!==b&&(r(a,void 0),n.$$parentForm.$$renameControl(n,b),r=c(n.$name),r(a,n))}));d.on("$destroy",function(){n.$$parentForm.$removeControl(n);r(a,void 0);S(n,Mb)})}}}}}]},Ge=ge(),
+Se=ge(!0),Pg=/^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-][0-2]\d:[0-5]\d|Z)$/,ah=/^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i,bh=/^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/,Qg=/^\s*(-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/,he=/^(\d{4,})-(\d{2})-(\d{2})$/,ie=/^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,
+Hc=/^(\d{4,})-W(\d\d)$/,je=/^(\d{4,})-(\d\d)$/,ke=/^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,ae=V();q(["date","datetime-local","month","time","week"],function(a){ae[a]=!0});var le={text:function(a,b,d,c,e,f){Ra(a,b,d,c,e,f);Cc(c)},date:ob("date",he,Nb(he,["yyyy","MM","dd"]),"yyyy-MM-dd"),"datetime-local":ob("datetimelocal",ie,Nb(ie,"yyyy MM dd HH mm ss sss".split(" ")),"yyyy-MM-ddTHH:mm:ss.sss"),time:ob("time",ke,Nb(ke,["HH","mm","ss","sss"]),"HH:mm:ss.sss"),week:ob("week",Hc,function(a,b){if(ga(a))return a;
+if(F(a)){Hc.lastIndex=0;var d=Hc.exec(a);if(d){var c=+d[1],e=+d[2],f=d=0,g=0,h=0,k=Vd(c),e=7*(e-1);b&&(d=b.getHours(),f=b.getMinutes(),g=b.getSeconds(),h=b.getMilliseconds());return new Date(c,0,k.getDate()+e,d,f,g,h)}}return NaN},"yyyy-Www"),month:ob("month",je,Nb(je,["yyyy","MM"]),"yyyy-MM"),number:function(a,b,d,c,e,f){Dc(a,b,d,c);be(c);Ra(a,b,d,c,e,f);var g,h;if(u(d.min)||d.ngMin)c.$validators.min=function(a){return c.$isEmpty(a)||w(g)||a>=g},d.$observe("min",function(a){g=Sa(a);c.$validate()});
+if(u(d.max)||d.ngMax)c.$validators.max=function(a){return c.$isEmpty(a)||w(h)||a<=h},d.$observe("max",function(a){h=Sa(a);c.$validate()});if(u(d.step)||d.ngStep){var k;c.$validators.step=function(a,b){return c.$isEmpty(b)||w(k)||ce(b,g||0,k)};d.$observe("step",function(a){k=Sa(a);c.$validate()})}},url:function(a,b,d,c,e,f){Ra(a,b,d,c,e,f);Cc(c);c.$$parserName="url";c.$validators.url=function(a,b){var d=a||b;return c.$isEmpty(d)||ah.test(d)}},email:function(a,b,d,c,e,f){Ra(a,b,d,c,e,f);Cc(c);c.$$parserName=
+"email";c.$validators.email=function(a,b){var d=a||b;return c.$isEmpty(d)||bh.test(d)}},radio:function(a,b,d,c){var e=!d.ngTrim||"false"!==T(d.ngTrim);w(d.name)&&b.attr("name",++qb);b.on("click",function(a){var g;b[0].checked&&(g=d.value,e&&(g=T(g)),c.$setViewValue(g,a&&a.type))});c.$render=function(){var a=d.value;e&&(a=T(a));b[0].checked=a===c.$viewValue};d.$observe("value",c.$render)},range:function(a,b,d,c,e,f){function g(a,c){b.attr(a,d[a]);d.$observe(a,c)}function h(a){n=Sa(a);da(c.$modelValue)||
+(m?(a=b.val(),n>a&&(a=n,b.val(a)),c.$setViewValue(a)):c.$validate())}function k(a){p=Sa(a);da(c.$modelValue)||(m?(a=b.val(),p<a&&(b.val(p),a=p<n?n:p),c.$setViewValue(a)):c.$validate())}function l(a){r=Sa(a);da(c.$modelValue)||(m&&c.$viewValue!==b.val()?c.$setViewValue(b.val()):c.$validate())}Dc(a,b,d,c);be(c);Ra(a,b,d,c,e,f);var m=c.$$hasNativeValidators&&"range"===b[0].type,n=m?0:void 0,p=m?100:void 0,r=m?1:void 0,q=b[0].validity;a=u(d.min);e=u(d.max);f=u(d.step);var s=c.$render;c.$render=m&&u(q.rangeUnderflow)&&
+u(q.rangeOverflow)?function(){s();c.$setViewValue(b.val())}:s;a&&(c.$validators.min=m?function(){return!0}:function(a,b){return c.$isEmpty(b)||w(n)||b>=n},g("min",h));e&&(c.$validators.max=m?function(){return!0}:function(a,b){return c.$isEmpty(b)||w(p)||b<=p},g("max",k));f&&(c.$validators.step=m?function(){return!q.stepMismatch}:function(a,b){return c.$isEmpty(b)||w(r)||ce(b,n||0,r)},g("step",l))},checkbox:function(a,b,d,c,e,f,g,h){var k=de(h,a,"ngTrueValue",d.ngTrueValue,!0),l=de(h,a,"ngFalseValue",
+d.ngFalseValue,!1);b.on("click",function(a){c.$setViewValue(b[0].checked,a&&a.type)});c.$render=function(){b[0].checked=c.$viewValue};c.$isEmpty=function(a){return!1===a};c.$formatters.push(function(a){return sa(a,k)});c.$parsers.push(function(a){return a?k:l})},hidden:z,button:z,submit:z,reset:z,file:z},Xc=["$browser","$sniffer","$filter","$parse",function(a,b,d,c){return{restrict:"E",require:["?ngModel"],link:{pre:function(e,f,g,h){h[0]&&(le[Q(g.type)]||le.text)(e,f,g,h[0],b,a,d,c)}}}}],ch=/^(true|false|\d+)$/,
+kf=function(){function a(a,d,c){var e=u(c)?c:9===za?"":null;a.prop("value",e);d.$set("value",c)}return{restrict:"A",priority:100,compile:function(b,d){return ch.test(d.ngValue)?function(b,d,f){b=b.$eval(f.ngValue);a(d,f,b)}:function(b,d,f){b.$watch(f.ngValue,function(b){a(d,f,b)})}}}},Ke=["$compile",function(a){return{restrict:"AC",compile:function(b){a.$$addBindingClass(b);return function(b,c,e){a.$$addBindingInfo(c,e.ngBind);c=c[0];b.$watch(e.ngBind,function(a){c.textContent=$b(a)})}}}}],Me=["$interpolate",
+"$compile",function(a,b){return{compile:function(d){b.$$addBindingClass(d);return function(c,d,f){c=a(d.attr(f.$attr.ngBindTemplate));b.$$addBindingInfo(d,c.expressions);d=d[0];f.$observe("ngBindTemplate",function(a){d.textContent=w(a)?"":a})}}}}],Le=["$sce","$parse","$compile",function(a,b,d){return{restrict:"A",compile:function(c,e){var f=b(e.ngBindHtml),g=b(e.ngBindHtml,function(b){return a.valueOf(b)});d.$$addBindingClass(c);return function(b,c,e){d.$$addBindingInfo(c,e.ngBindHtml);b.$watch(g,
+function(){var d=f(b);c.html(a.getTrustedHtml(d)||"")})}}}}],jf=la({restrict:"A",require:"ngModel",link:function(a,b,d,c){c.$viewChangeListeners.push(function(){a.$eval(d.ngChange)})}}),Ne=Fc("",!0),Pe=Fc("Odd",0),Oe=Fc("Even",1),Qe=Qa({compile:function(a,b){b.$set("ngCloak",void 0);a.removeClass("ng-cloak")}}),Re=[function(){return{restrict:"A",scope:!0,controller:"@",priority:500}}],bd={},dh={blur:!0,focus:!0};q("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),
+function(a){var b=Ba("ng-"+a);bd[b]=["$parse","$rootScope",function(d,c){return{restrict:"A",compile:function(e,f){var g=d(f[b]);return function(b,d){d.on(a,function(d){var e=function(){g(b,{$event:d})};dh[a]&&c.$$phase?b.$evalAsync(e):b.$apply(e)})}}}}]});var Ue=["$animate","$compile",function(a,b){return{multiElement:!0,transclude:"element",priority:600,terminal:!0,restrict:"A",$$tlb:!0,link:function(d,c,e,f,g){var h,k,l;d.$watch(e.ngIf,function(d){d?k||g(function(d,f){k=f;d[d.length++]=b.$$createComment("end ngIf",
+e.ngIf);h={clone:d};a.enter(d,c.parent(),c)}):(l&&(l.remove(),l=null),k&&(k.$destroy(),k=null),h&&(l=tb(h.clone),a.leave(l).done(function(a){!1!==a&&(l=null)}),h=null))})}}}],Ve=["$templateRequest","$anchorScroll","$animate",function(a,b,d){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",controller:ea.noop,compile:function(c,e){var f=e.ngInclude||e.src,g=e.onload||"",h=e.autoscroll;return function(c,e,m,n,p){var r=0,q,s,t,w=function(){s&&(s.remove(),s=null);q&&(q.$destroy(),q=
+null);t&&(d.leave(t).done(function(a){!1!==a&&(s=null)}),s=t,t=null)};c.$watch(f,function(f){var m=function(a){!1===a||!u(h)||h&&!c.$eval(h)||b()},s=++r;f?(a(f,!0).then(function(a){if(!c.$$destroyed&&s===r){var b=c.$new();n.template=a;a=p(b,function(a){w();d.enter(a,null,e).done(m)});q=b;t=a;q.$emit("$includeContentLoaded",f);c.$eval(g)}},function(){c.$$destroyed||s!==r||(w(),c.$emit("$includeContentError",f))}),c.$emit("$includeContentRequested",f)):(w(),n.template=null)})}}}}],mf=["$compile",function(a){return{restrict:"ECA",
+priority:-400,require:"ngInclude",link:function(b,d,c,e){ma.call(d[0]).match(/SVG/)?(d.empty(),a(dd(e.template,x.document).childNodes)(b,function(a){d.append(a)},{futureParentElement:d})):(d.html(e.template),a(d.contents())(b))}}}],We=Qa({priority:450,compile:function(){return{pre:function(a,b,d){a.$eval(d.ngInit)}}}}),hf=function(){return{restrict:"A",priority:100,require:"ngModel",link:function(a,b,d,c){var e=d.ngList||", ",f="false"!==d.ngTrim,g=f?T(e):e;c.$parsers.push(function(a){if(!w(a)){var b=
+[];a&&q(a.split(g),function(a){a&&b.push(f?T(a):a)});return b}});c.$formatters.push(function(a){if(H(a))return a.join(e)});c.$isEmpty=function(a){return!a||!a.length}}}},nb="ng-valid",Yd="ng-invalid",Va="ng-pristine",Rb="ng-dirty",pb=L("ngModel");Ob.$inject="$scope $exceptionHandler $attrs $element $parse $animate $timeout $q $interpolate".split(" ");Ob.prototype={$$initGetterSetters:function(){if(this.$options.getOption("getterSetter")){var a=this.$$parse(this.$$attr.ngModel+"()"),b=this.$$parse(this.$$attr.ngModel+
+"($$$p)");this.$$ngModelGet=function(b){var c=this.$$parsedNgModel(b);D(c)&&(c=a(b));return c};this.$$ngModelSet=function(a,c){D(this.$$parsedNgModel(a))?b(a,{$$$p:c}):this.$$parsedNgModelAssign(a,c)}}else if(!this.$$parsedNgModel.assign)throw pb("nonassign",this.$$attr.ngModel,xa(this.$$element));},$render:z,$isEmpty:function(a){return w(a)||""===a||null===a||a!==a},$$updateEmptyClasses:function(a){this.$isEmpty(a)?(this.$$animate.removeClass(this.$$element,"ng-not-empty"),this.$$animate.addClass(this.$$element,
+"ng-empty")):(this.$$animate.removeClass(this.$$element,"ng-empty"),this.$$animate.addClass(this.$$element,"ng-not-empty"))},$setPristine:function(){this.$dirty=!1;this.$pristine=!0;this.$$animate.removeClass(this.$$element,Rb);this.$$animate.addClass(this.$$element,Va)},$setDirty:function(){this.$dirty=!0;this.$pristine=!1;this.$$animate.removeClass(this.$$element,Va);this.$$animate.addClass(this.$$element,Rb);this.$$parentForm.$setDirty()},$setUntouched:function(){this.$touched=!1;this.$untouched=
+!0;this.$$animate.setClass(this.$$element,"ng-untouched","ng-touched")},$setTouched:function(){this.$touched=!0;this.$untouched=!1;this.$$animate.setClass(this.$$element,"ng-touched","ng-untouched")},$rollbackViewValue:function(){this.$$timeout.cancel(this.$$pendingDebounce);this.$viewValue=this.$$lastCommittedViewValue;this.$render()},$validate:function(){if(!da(this.$modelValue)){var a=this.$$lastCommittedViewValue,b=this.$$rawModelValue,d=this.$valid,c=this.$modelValue,e=this.$options.getOption("allowInvalid"),
+f=this;this.$$runValidators(b,a,function(a){e||d===a||(f.$modelValue=a?b:void 0,f.$modelValue!==c&&f.$$writeModelToScope())})}},$$runValidators:function(a,b,d){function c(){var c=!0;q(k.$validators,function(d,e){var g=Boolean(d(a,b));c=c&&g;f(e,g)});return c?!0:(q(k.$asyncValidators,function(a,b){f(b,null)}),!1)}function e(){var c=[],d=!0;q(k.$asyncValidators,function(e,g){var k=e(a,b);if(!k||!D(k.then))throw pb("nopromise",k);f(g,void 0);c.push(k.then(function(){f(g,!0)},function(){d=!1;f(g,!1)}))});
+c.length?k.$$q.all(c).then(function(){g(d)},z):g(!0)}function f(a,b){h===k.$$currentValidationRunId&&k.$setValidity(a,b)}function g(a){h===k.$$currentValidationRunId&&d(a)}this.$$currentValidationRunId++;var h=this.$$currentValidationRunId,k=this;(function(){var a=k.$$parserName||"parse";if(w(k.$$parserValid))f(a,null);else return k.$$parserValid||(q(k.$validators,function(a,b){f(b,null)}),q(k.$asyncValidators,function(a,b){f(b,null)})),f(a,k.$$parserValid),k.$$parserValid;return!0})()?c()?e():g(!1):
+g(!1)},$commitViewValue:function(){var a=this.$viewValue;this.$$timeout.cancel(this.$$pendingDebounce);if(this.$$lastCommittedViewValue!==a||""===a&&this.$$hasNativeValidators)this.$$updateEmptyClasses(a),this.$$lastCommittedViewValue=a,this.$pristine&&this.$setDirty(),this.$$parseAndValidate()},$$parseAndValidate:function(){var a=this.$$lastCommittedViewValue,b=this;if(this.$$parserValid=w(a)?void 0:!0)for(var d=0;d<this.$parsers.length;d++)if(a=this.$parsers[d](a),w(a)){this.$$parserValid=!1;break}da(this.$modelValue)&&
+(this.$modelValue=this.$$ngModelGet(this.$$scope));var c=this.$modelValue,e=this.$options.getOption("allowInvalid");this.$$rawModelValue=a;e&&(this.$modelValue=a,b.$modelValue!==c&&b.$$writeModelToScope());this.$$runValidators(a,this.$$lastCommittedViewValue,function(d){e||(b.$modelValue=d?a:void 0,b.$modelValue!==c&&b.$$writeModelToScope())})},$$writeModelToScope:function(){this.$$ngModelSet(this.$$scope,this.$modelValue);q(this.$viewChangeListeners,function(a){try{a()}catch(b){this.$$exceptionHandler(b)}},
+this)},$setViewValue:function(a,b){this.$viewValue=a;this.$options.getOption("updateOnDefault")&&this.$$debounceViewValueCommit(b)},$$debounceViewValueCommit:function(a){var b=this.$options.getOption("debounce");ba(b[a])?b=b[a]:ba(b["default"])&&(b=b["default"]);this.$$timeout.cancel(this.$$pendingDebounce);var d=this;0<b?this.$$pendingDebounce=this.$$timeout(function(){d.$commitViewValue()},b):this.$$scope.$root.$$phase?this.$commitViewValue():this.$$scope.$apply(function(){d.$commitViewValue()})},
+$overrideModelOptions:function(a){this.$options=this.$options.createChild(a)}};Zd({clazz:Ob,set:function(a,b){a[b]=!0},unset:function(a,b){delete a[b]}});var gf=["$rootScope",function(a){return{restrict:"A",require:["ngModel","^?form","^?ngModelOptions"],controller:Ob,priority:1,compile:function(b){b.addClass(Va).addClass("ng-untouched").addClass(nb);return{pre:function(a,b,e,f){var g=f[0];b=f[1]||g.$$parentForm;if(f=f[2])g.$options=f.$options;g.$$initGetterSetters();b.$addControl(g);e.$observe("name",
+function(a){g.$name!==a&&g.$$parentForm.$$renameControl(g,a)});a.$on("$destroy",function(){g.$$parentForm.$removeControl(g)})},post:function(b,c,e,f){function g(){h.$setTouched()}var h=f[0];if(h.$options.getOption("updateOn"))c.on(h.$options.getOption("updateOn"),function(a){h.$$debounceViewValueCommit(a&&a.type)});c.on("blur",function(){h.$touched||(a.$$phase?b.$evalAsync(g):b.$apply(g))})}}}}}],Pb,eh=/(\s+|^)default(\s+|$)/;Gc.prototype={getOption:function(a){return this.$$options[a]},createChild:function(a){var b=
+!1;a=S({},a);q(a,function(d,c){"$inherit"===d?"*"===c?b=!0:(a[c]=this.$$options[c],"updateOn"===c&&(a.updateOnDefault=this.$$options.updateOnDefault)):"updateOn"===c&&(a.updateOnDefault=!1,a[c]=T(d.replace(eh,function(){a.updateOnDefault=!0;return" "})))},this);b&&(delete a["*"],ee(a,this.$$options));ee(a,Pb.$$options);return new Gc(a)}};Pb=new Gc({updateOn:"",updateOnDefault:!0,debounce:0,getterSetter:!1,allowInvalid:!1,timezone:null});var lf=function(){function a(a,d){this.$$attrs=a;this.$$scope=
+d}a.$inject=["$attrs","$scope"];a.prototype={$onInit:function(){var a=this.parentCtrl?this.parentCtrl.$options:Pb,d=this.$$scope.$eval(this.$$attrs.ngModelOptions);this.$options=a.createChild(d)}};return{restrict:"A",priority:10,require:{parentCtrl:"?^^ngModelOptions"},bindToController:!0,controller:a}},Xe=Qa({terminal:!0,priority:1E3}),fh=L("ngOptions"),gh=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([$\w][$\w]*)|(?:\(\s*([$\w][$\w]*)\s*,\s*([$\w][$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,
+ef=["$compile","$document","$parse",function(a,b,d){function c(a,b,c){function e(a,b,c,d,f){this.selectValue=a;this.viewValue=b;this.label=c;this.group=d;this.disabled=f}function f(a){var b;if(!q&&qa(a))b=a;else{b=[];for(var c in a)a.hasOwnProperty(c)&&"$"!==c.charAt(0)&&b.push(c)}return b}var n=a.match(gh);if(!n)throw fh("iexp",a,xa(b));var p=n[5]||n[7],q=n[6];a=/ as /.test(n[0])&&n[1];var s=n[9];b=d(n[2]?n[1]:p);var v=a&&d(a)||b,t=s&&d(s),u=s?function(a,b){return t(c,b)}:function(a){return Pa(a)},
+w=function(a,b){return u(a,G(a,b))},A=d(n[2]||n[1]),x=d(n[3]||""),I=d(n[4]||""),K=d(n[8]),E={},G=q?function(a,b){E[q]=b;E[p]=a;return E}:function(a){E[p]=a;return E};return{trackBy:s,getTrackByValue:w,getWatchables:d(K,function(a){var b=[];a=a||[];for(var d=f(a),e=d.length,g=0;g<e;g++){var h=a===d?g:d[g],l=a[h],h=G(l,h),l=u(l,h);b.push(l);if(n[2]||n[1])l=A(c,h),b.push(l);n[4]&&(h=I(c,h),b.push(h))}return b}),getOptions:function(){for(var a=[],b={},d=K(c)||[],g=f(d),h=g.length,n=0;n<h;n++){var p=d===
+g?n:g[n],q=G(d[p],p),r=v(c,q),p=u(r,q),t=A(c,q),E=x(c,q),q=I(c,q),r=new e(p,r,t,E,q);a.push(r);b[p]=r}return{items:a,selectValueMap:b,getOptionFromViewValue:function(a){return b[w(a)]},getViewValueFromOption:function(a){return s?ra(a.viewValue):a.viewValue}}}}}var e=x.document.createElement("option"),f=x.document.createElement("optgroup");return{restrict:"A",terminal:!0,require:["select","ngModel"],link:{pre:function(a,b,c,d){d[0].registerOption=z},post:function(d,h,k,l){function m(a){var b=(a=A.getOptionFromViewValue(a))&&
+a.element;b&&!b.selected&&(b.selected=!0);return a}function n(a,b){a.element=b;b.disabled=a.disabled;a.label!==b.label&&(b.label=a.label,b.textContent=a.label);b.value=a.selectValue}function p(){var a=A&&r.readValue();if(A)for(var b=A.items.length-1;0<=b;b--){var c=A.items[b];u(c.group)?Eb(c.element.parentNode):Eb(c.element)}A=z.getOptions();var d={};x&&h.prepend(r.emptyOption);A.items.forEach(function(a){var b;if(u(a.group)){b=d[a.group];b||(b=f.cloneNode(!1),I.appendChild(b),b.label=null===a.group?
+"null":a.group,d[a.group]=b);var c=e.cloneNode(!1)}else b=I,c=e.cloneNode(!1);b.appendChild(c);n(a,c)});h[0].appendChild(I);s.$render();s.$isEmpty(a)||(b=r.readValue(),(z.trackBy||v?sa(a,b):a===b)||(s.$setViewValue(b),s.$render()))}var r=l[0],s=l[1],v=k.multiple;l=0;for(var t=h.children(),w=t.length;l<w;l++)if(""===t[l].value){r.hasEmptyOption=!0;r.emptyOption=t.eq(l);break}var x=!!r.emptyOption;B(e.cloneNode(!1)).val("?");var A,z=c(k.ngOptions,h,d),I=b[0].createDocumentFragment();r.generateUnknownOptionValue=
+function(a){return"?"};v?(r.writeValue=function(a){var b=a&&a.map(m)||[];A.items.forEach(function(a){a.element.selected&&-1===Array.prototype.indexOf.call(b,a)&&(a.element.selected=!1)})},r.readValue=function(){var a=h.val()||[],b=[];q(a,function(a){(a=A.selectValueMap[a])&&!a.disabled&&b.push(A.getViewValueFromOption(a))});return b},z.trackBy&&d.$watchCollection(function(){if(H(s.$viewValue))return s.$viewValue.map(function(a){return z.getTrackByValue(a)})},function(){s.$render()})):(r.writeValue=
+function(a){var b=A.selectValueMap[h.val()],c=A.getOptionFromViewValue(a);b&&b.element.removeAttribute("selected");c?(h[0].value!==c.selectValue&&(r.removeUnknownOption(),r.unselectEmptyOption(),h[0].value=c.selectValue,c.element.selected=!0),c.element.setAttribute("selected","selected")):x?r.selectEmptyOption():r.unknownOption.parent().length?r.updateUnknownOption(a):r.renderUnknownOption(a)},r.readValue=function(){var a=A.selectValueMap[h.val()];return a&&!a.disabled?(r.unselectEmptyOption(),r.removeUnknownOption(),
+A.getViewValueFromOption(a)):null},z.trackBy&&d.$watch(function(){return z.getTrackByValue(s.$viewValue)},function(){s.$render()}));x&&(r.emptyOption.remove(),a(r.emptyOption)(d),8===r.emptyOption[0].nodeType?(r.hasEmptyOption=!1,r.registerOption=function(a,b){""===b.val()&&(r.hasEmptyOption=!0,r.emptyOption=b,r.emptyOption.removeClass("ng-scope"),s.$render(),b.on("$destroy",function(){r.hasEmptyOption=!1;r.emptyOption=void 0}))}):r.emptyOption.removeClass("ng-scope"));h.empty();p();d.$watchCollection(z.getWatchables,
+p)}}}}],Ye=["$locale","$interpolate","$log",function(a,b,d){var c=/{}/g,e=/^when(Minus)?(.+)$/;return{link:function(f,g,h){function k(a){g.text(a||"")}var l=h.count,m=h.$attr.when&&g.attr(h.$attr.when),n=h.offset||0,p=f.$eval(m)||{},r={},s=b.startSymbol(),v=b.endSymbol(),t=s+l+"-"+n+v,u=ea.noop,x;q(h,function(a,b){var c=e.exec(b);c&&(c=(c[1]?"-":"")+Q(c[2]),p[c]=g.attr(h.$attr[b]))});q(p,function(a,d){r[d]=b(a.replace(c,t))});f.$watch(l,function(b){var c=parseFloat(b),e=da(c);e||c in p||(c=a.pluralCat(c-
+n));c===x||e&&da(x)||(u(),e=r[c],w(e)?(null!=b&&d.debug("ngPluralize: no rule defined for '"+c+"' in "+m),u=z,k()):u=f.$watch(e,k),x=c)})}}}],Ze=["$parse","$animate","$compile",function(a,b,d){var c=L("ngRepeat"),e=function(a,b,c,d,e,m,n){a[c]=d;e&&(a[e]=m);a.$index=b;a.$first=0===b;a.$last=b===n-1;a.$middle=!(a.$first||a.$last);a.$odd=!(a.$even=0===(b&1))};return{restrict:"A",multiElement:!0,transclude:"element",priority:1E3,terminal:!0,$$tlb:!0,compile:function(f,g){var h=g.ngRepeat,k=d.$$createComment("end ngRepeat",
+h),l=h.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);if(!l)throw c("iexp",h);var m=l[1],n=l[2],p=l[3],r=l[4],l=m.match(/^(?:(\s*[$\w]+)|\(\s*([$\w]+)\s*,\s*([$\w]+)\s*\))$/);if(!l)throw c("iidexp",m);var s=l[3]||l[1],v=l[2];if(p&&(!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(p)||/^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(p)))throw c("badident",p);var t,u,w,x,z={$id:Pa};r?t=a(r):(w=function(a,b){return Pa(b)},
+x=function(a){return a});return function(a,d,f,g,l){t&&(u=function(b,c,d){v&&(z[v]=b);z[s]=c;z.$index=d;return t(a,z)});var m=V();a.$watchCollection(n,function(f){var g,n,r=d[0],t,z=V(),B,D,F,C,G,E,H;p&&(a[p]=f);if(qa(f))G=f,n=u||w;else for(H in n=u||x,G=[],f)ua.call(f,H)&&"$"!==H.charAt(0)&&G.push(H);B=G.length;H=Array(B);for(g=0;g<B;g++)if(D=f===G?g:G[g],F=f[D],C=n(D,F,g),m[C])E=m[C],delete m[C],z[C]=E,H[g]=E;else{if(z[C])throw q(H,function(a){a&&a.scope&&(m[a.id]=a)}),c("dupes",h,C,F);H[g]={id:C,
+scope:void 0,clone:void 0};z[C]=!0}for(t in m){E=m[t];C=tb(E.clone);b.leave(C);if(C[0].parentNode)for(g=0,n=C.length;g<n;g++)C[g].$$NG_REMOVED=!0;E.scope.$destroy()}for(g=0;g<B;g++)if(D=f===G?g:G[g],F=f[D],E=H[g],E.scope){t=r;do t=t.nextSibling;while(t&&t.$$NG_REMOVED);E.clone[0]!==t&&b.move(tb(E.clone),null,r);r=E.clone[E.clone.length-1];e(E.scope,g,s,F,v,D,B)}else l(function(a,c){E.scope=c;var d=k.cloneNode(!1);a[a.length++]=d;b.enter(a,null,r);r=d;E.clone=a;z[E.id]=E;e(E.scope,g,s,F,v,D,B)});m=
+z})}}}}],$e=["$animate",function(a){return{restrict:"A",multiElement:!0,link:function(b,d,c){b.$watch(c.ngShow,function(b){a[b?"removeClass":"addClass"](d,"ng-hide",{tempClasses:"ng-hide-animate"})})}}}],Te=["$animate",function(a){return{restrict:"A",multiElement:!0,link:function(b,d,c){b.$watch(c.ngHide,function(b){a[b?"addClass":"removeClass"](d,"ng-hide",{tempClasses:"ng-hide-animate"})})}}}],af=Qa(function(a,b,d){a.$watch(d.ngStyle,function(a,d){d&&a!==d&&q(d,function(a,c){b.css(c,"")});a&&b.css(a)},
+!0)}),bf=["$animate","$compile",function(a,b){return{require:"ngSwitch",controller:["$scope",function(){this.cases={}}],link:function(d,c,e,f){var g=[],h=[],k=[],l=[],m=function(a,b){return function(c){!1!==c&&a.splice(b,1)}};d.$watch(e.ngSwitch||e.on,function(c){for(var d,e;k.length;)a.cancel(k.pop());d=0;for(e=l.length;d<e;++d){var s=tb(h[d].clone);l[d].$destroy();(k[d]=a.leave(s)).done(m(k,d))}h.length=0;l.length=0;(g=f.cases["!"+c]||f.cases["?"])&&q(g,function(c){c.transclude(function(d,e){l.push(e);
+var f=c.element;d[d.length++]=b.$$createComment("end ngSwitchWhen");h.push({clone:d});a.enter(d,f.parent(),f)})})})}}}],cf=Qa({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(a,b,d,c,e){a=d.ngSwitchWhen.split(d.ngSwitchWhenSeparator).sort().filter(function(a,b,c){return c[b-1]!==a});q(a,function(a){c.cases["!"+a]=c.cases["!"+a]||[];c.cases["!"+a].push({transclude:e,element:b})})}}),df=Qa({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(a,
+b,d,c,e){c.cases["?"]=c.cases["?"]||[];c.cases["?"].push({transclude:e,element:b})}}),hh=L("ngTransclude"),ff=["$compile",function(a){return{restrict:"EAC",terminal:!0,compile:function(b){var d=a(b.contents());b.empty();return function(a,b,f,g,h){function k(){d(a,function(a){b.append(a)})}if(!h)throw hh("orphan",xa(b));f.ngTransclude===f.$attr.ngTransclude&&(f.ngTransclude="");f=f.ngTransclude||f.ngTranscludeSlot;h(function(a,c){var d;if(d=a.length)a:{d=0;for(var f=a.length;d<f;d++){var g=a[d];if(g.nodeType!==
+Ia||g.nodeValue.trim()){d=!0;break a}}d=void 0}d?b.append(a):(k(),c.$destroy())},null,f);f&&!h.isSlotFilled(f)&&k()}}}}],He=["$templateCache",function(a){return{restrict:"E",terminal:!0,compile:function(b,d){"text/ng-template"===d.type&&a.put(d.id,b[0].text)}}}],ih={$setViewValue:z,$render:z},jh=["$element","$scope",function(a,b){function d(){g||(g=!0,b.$$postDigest(function(){g=!1;e.ngModelCtrl.$render()}))}function c(a){h||(h=!0,b.$$postDigest(function(){b.$$destroyed||(h=!1,e.ngModelCtrl.$setViewValue(e.readValue()),
+a&&e.ngModelCtrl.$render())}))}var e=this,f=new Gb;e.selectValueMap={};e.ngModelCtrl=ih;e.multiple=!1;e.unknownOption=B(x.document.createElement("option"));e.hasEmptyOption=!1;e.emptyOption=void 0;e.renderUnknownOption=function(b){b=e.generateUnknownOptionValue(b);e.unknownOption.val(b);a.prepend(e.unknownOption);Ta(e.unknownOption,!0);a.val(b)};e.updateUnknownOption=function(b){b=e.generateUnknownOptionValue(b);e.unknownOption.val(b);Ta(e.unknownOption,!0);a.val(b)};e.generateUnknownOptionValue=
+function(a){return"? "+Pa(a)+" ?"};e.removeUnknownOption=function(){e.unknownOption.parent()&&e.unknownOption.remove()};e.selectEmptyOption=function(){e.emptyOption&&(a.val(""),Ta(e.emptyOption,!0))};e.unselectEmptyOption=function(){e.hasEmptyOption&&e.emptyOption.removeAttr("selected")};b.$on("$destroy",function(){e.renderUnknownOption=z});e.readValue=function(){var b=a.val(),b=b in e.selectValueMap?e.selectValueMap[b]:b;return e.hasOption(b)?b:null};e.writeValue=function(b){var c=a[0].options[a[0].selectedIndex];
+c&&Ta(B(c),!1);e.hasOption(b)?(e.removeUnknownOption(),c=Pa(b),a.val(c in e.selectValueMap?c:b),Ta(B(a[0].options[a[0].selectedIndex]),!0)):null==b&&e.emptyOption?(e.removeUnknownOption(),e.selectEmptyOption()):e.unknownOption.parent().length?e.updateUnknownOption(b):e.renderUnknownOption(b)};e.addOption=function(a,b){if(8!==b[0].nodeType){Ka(a,'"option value"');""===a&&(e.hasEmptyOption=!0,e.emptyOption=b);var c=f.get(a)||0;f.set(a,c+1);d()}};e.removeOption=function(a){var b=f.get(a);b&&(1===b?(f.delete(a),
+""===a&&(e.hasEmptyOption=!1,e.emptyOption=void 0)):f.set(a,b-1))};e.hasOption=function(a){return!!f.get(a)};var g=!1,h=!1;e.registerOption=function(a,b,f,g,h){if(f.$attr.ngValue){var q,s=NaN;f.$observe("value",function(a){var d,f=b.prop("selected");u(s)&&(e.removeOption(q),delete e.selectValueMap[s],d=!0);s=Pa(a);q=a;e.selectValueMap[s]=a;e.addOption(a,b);b.attr("value",s);d&&f&&c()})}else g?f.$observe("value",function(a){e.readValue();var d,f=b.prop("selected");u(q)&&(e.removeOption(q),d=!0);q=
+a;e.addOption(a,b);d&&f&&c()}):h?a.$watch(h,function(a,d){f.$set("value",a);var g=b.prop("selected");d!==a&&e.removeOption(d);e.addOption(a,b);d&&g&&c()}):e.addOption(f.value,b);f.$observe("disabled",function(a){if("true"===a||a&&b.prop("selected"))e.multiple?c(!0):(e.ngModelCtrl.$setViewValue(null),e.ngModelCtrl.$render())});b.on("$destroy",function(){var a=e.readValue(),b=f.value;e.removeOption(b);d();(e.multiple&&a&&-1!==a.indexOf(b)||a===b)&&c(!0)})}}],Ie=function(){return{restrict:"E",require:["select",
+"?ngModel"],controller:jh,priority:1,link:{pre:function(a,b,d,c){var e=c[0],f=c[1];if(f){if(e.ngModelCtrl=f,b.on("change",function(){e.removeUnknownOption();a.$apply(function(){f.$setViewValue(e.readValue())})}),d.multiple){e.multiple=!0;e.readValue=function(){var a=[];q(b.find("option"),function(b){b.selected&&!b.disabled&&(b=b.value,a.push(b in e.selectValueMap?e.selectValueMap[b]:b))});return a};e.writeValue=function(a){q(b.find("option"),function(b){var c=!!a&&(-1!==Array.prototype.indexOf.call(a,
+b.value)||-1!==Array.prototype.indexOf.call(a,e.selectValueMap[b.value]));c!==b.selected&&Ta(B(b),c)})};var g,h=NaN;a.$watch(function(){h!==f.$viewValue||sa(g,f.$viewValue)||(g=pa(f.$viewValue),f.$render());h=f.$viewValue});f.$isEmpty=function(a){return!a||0===a.length}}}else e.registerOption=z},post:function(a,b,d,c){var e=c[1];if(e){var f=c[0];e.$render=function(){f.writeValue(e.$viewValue)}}}}}},Je=["$interpolate",function(a){return{restrict:"E",priority:100,compile:function(b,d){var c,e;u(d.ngValue)||
+(u(d.value)?c=a(d.value,!0):(e=a(b.text(),!0))||d.$set("value",b.text()));return function(a,b,d){var k=b.parent();(k=k.data("$selectController")||k.parent().data("$selectController"))&&k.registerOption(a,b,d,c,e)}}}}],Zc=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){c&&(d.required=!0,c.$validators.required=function(a,b){return!d.required||!c.$isEmpty(b)},d.$observe("required",function(){c.$validate()}))}}},Yc=function(){return{restrict:"A",require:"?ngModel",link:function(a,
+b,d,c){if(c){var e,f=d.ngPattern||d.pattern;d.$observe("pattern",function(a){F(a)&&0<a.length&&(a=new RegExp("^"+a+"$"));if(a&&!a.test)throw L("ngPattern")("noregexp",f,a,xa(b));e=a||void 0;c.$validate()});c.$validators.pattern=function(a,b){return c.$isEmpty(b)||w(e)||e.test(b)}}}}},ad=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){if(c){var e=-1;d.$observe("maxlength",function(a){a=Z(a);e=da(a)?-1:a;c.$validate()});c.$validators.maxlength=function(a,b){return 0>e||c.$isEmpty(b)||
+b.length<=e}}}}},$c=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){if(c){var e=0;d.$observe("minlength",function(a){e=Z(a)||0;c.$validate()});c.$validators.minlength=function(a,b){return c.$isEmpty(b)||b.length>=e}}}}};x.angular.bootstrap?x.console&&console.log("WARNING: Tried to load angular more than once."):(ze(),Ce(ea),ea.module("ngLocale",[],["$provide",function(a){function b(a){a+="";var b=a.indexOf(".");return-1==b?0:a.length-b-1}a.value("$locale",{DATETIME_FORMATS:{AMPMS:["AM",
+"PM"],DAY:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),ERANAMES:["Before Christ","Anno Domini"],ERAS:["BC","AD"],FIRSTDAYOFWEEK:6,MONTH:"January February March April May June July August September October November December".split(" "),SHORTDAY:"Sun Mon Tue Wed Thu Fri Sat".split(" "),SHORTMONTH:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),STANDALONEMONTH:"January February March April May June July August September October November December".split(" "),WEEKENDRANGE:[5,
+6],fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",medium:"MMM d, y h:mm:ss a",mediumDate:"MMM d, y",mediumTime:"h:mm:ss a","short":"M/d/yy h:mm a",shortDate:"M/d/yy",shortTime:"h:mm a"},NUMBER_FORMATS:{CURRENCY_SYM:"$",DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{gSize:3,lgSize:3,maxFrac:3,minFrac:0,minInt:1,negPre:"-",negSuf:"",posPre:"",posSuf:""},{gSize:3,lgSize:3,maxFrac:2,minFrac:2,minInt:1,negPre:"-\u00a4",negSuf:"",posPre:"\u00a4",posSuf:""}]},id:"en-us",localeID:"en_US",pluralCat:function(a,
+c){var e=a|0,f=c;void 0===f&&(f=Math.min(b(a),3));Math.pow(10,f);return 1==e&&0==f?"one":"other"}})}]),B(function(){ue(x.document,Sc)}))})(window);!window.angular.$$csp().noInlineStyle&&window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
+//# sourceMappingURL=angular.min.js.map
diff --git a/tests/end2end/data/hints/html/angular1.html b/tests/end2end/data/hints/html/angular.html
similarity index 84%
rename from tests/end2end/data/hints/html/angular1.html
rename to tests/end2end/data/hints/html/angular.html
index de7712c0b..bc6b10340 100644
--- a/tests/end2end/data/hints/html/angular1.html
+++ b/tests/end2end/data/hints/html/angular.html
@@ -11,7 +11,7 @@
 			<p>The button has been clicked {{count}} times.</p>
 		</div>
 
-		<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
+		<script src="../angular1/angular.min.js"></script>
 		<script>
 			angular.module('myApp', [])
 			.controller('myCtrl', ['$scope', function($scope) {

From ec08a19e7d8ab9651f3dd960e09bb0f241a1fb59 Mon Sep 17 00:00:00 2001
From: Nemanja Nedeljkovic <nemanjan00@gmail.com>
Date: Sun, 7 Jan 2018 11:23:28 +0100
Subject: [PATCH 284/322] Rename angular.html to angular1.html

---
 tests/end2end/data/hints/html/{angular.html => angular1.html} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/end2end/data/hints/html/{angular.html => angular1.html} (100%)

diff --git a/tests/end2end/data/hints/html/angular.html b/tests/end2end/data/hints/html/angular1.html
similarity index 100%
rename from tests/end2end/data/hints/html/angular.html
rename to tests/end2end/data/hints/html/angular1.html

From 957d5b3f028d285edbae7d37bd2dd0a09a60aaca Mon Sep 17 00:00:00 2001
From: Nemanja Nedeljkovic <nemanjan00@gmail.com>
Date: Sun, 7 Jan 2018 11:58:02 +0100
Subject: [PATCH 285/322] Add more angular1 selectors

---
 qutebrowser/browser/webelem.py              | 2 +-
 tests/end2end/data/hints/html/angular1.html | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/qutebrowser/browser/webelem.py b/qutebrowser/browser/webelem.py
index bcea5aeb0..2b11bee40 100644
--- a/qutebrowser/browser/webelem.py
+++ b/qutebrowser/browser/webelem.py
@@ -42,7 +42,7 @@ Group = enum.Enum('Group', ['all', 'links', 'images', 'url', 'inputs'])
 SELECTORS = {
     Group.all: ('a, area, textarea, select, input:not([type=hidden]), button, '
                 'frame, iframe, link, [onclick], [onmousedown], [role=link], '
-                '[role=option], [role=button], img, [ng-click]'),
+                '[role=option], [role=button], img, [ng-click], [ngClick], [data-ng-click], [x-ng-click]'),
     Group.links: 'a[href], area[href], link[href], [role=link][href]',
     Group.images: 'img',
     Group.url: '[src], [href]',
diff --git a/tests/end2end/data/hints/html/angular1.html b/tests/end2end/data/hints/html/angular1.html
index bc6b10340..4693a634a 100644
--- a/tests/end2end/data/hints/html/angular1.html
+++ b/tests/end2end/data/hints/html/angular1.html
@@ -6,18 +6,14 @@
 	<body ng-app="myApp">
 
 		<div ng-controller="myCtrl">
-			<p>Click the button to run a function:</p>
 			<p id="link" ng-click="myFunc()">OK</p>
-			<p>The button has been clicked {{count}} times.</p>
 		</div>
 
 		<script src="../angular1/angular.min.js"></script>
 		<script>
 			angular.module('myApp', [])
 			.controller('myCtrl', ['$scope', function($scope) {
-				$scope.count = 0;
 				$scope.myFunc = function() {
-					$scope.count++;
 					window.location = "/data/hello.txt";
 				};
 			}]);

From 5f3ee66775f5bc081993a88a0a53897170b8fb94 Mon Sep 17 00:00:00 2001
From: Nemanja Nedeljkovic <nemanjan00@gmail.com>
Date: Sun, 7 Jan 2018 12:06:36 +0100
Subject: [PATCH 286/322] Code style improvement and documentation

---
 qutebrowser/browser/webelem.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/webelem.py b/qutebrowser/browser/webelem.py
index 2b11bee40..30355ad1a 100644
--- a/qutebrowser/browser/webelem.py
+++ b/qutebrowser/browser/webelem.py
@@ -42,7 +42,9 @@ Group = enum.Enum('Group', ['all', 'links', 'images', 'url', 'inputs'])
 SELECTORS = {
     Group.all: ('a, area, textarea, select, input:not([type=hidden]), button, '
                 'frame, iframe, link, [onclick], [onmousedown], [role=link], '
-                '[role=option], [role=button], img, [ng-click], [ngClick], [data-ng-click], [x-ng-click]'),
+                '[role=option], [role=button], img, '
+                # Angular 1 selectors
+                '[ng-click], [ngClick], [data-ng-click], [x-ng-click]'),
     Group.links: 'a[href], area[href], link[href], [role=link][href]',
     Group.images: 'img',
     Group.url: '[src], [href]',

From 0101596148ad823e0be4c576187fa4e2a37dcf4b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jan 2018 16:39:12 +0100
Subject: [PATCH 287/322] Update codecov from 2.0.10 to 2.0.13

---
 misc/requirements/requirements-codecov.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-codecov.txt b/misc/requirements/requirements-codecov.txt
index 6601cfb12..df7a12ed6 100644
--- a/misc/requirements/requirements-codecov.txt
+++ b/misc/requirements/requirements-codecov.txt
@@ -2,7 +2,7 @@
 
 certifi==2017.11.5
 chardet==3.0.4
-codecov==2.0.10
+codecov==2.0.13
 coverage==4.4.2
 idna==2.6
 requests==2.18.4

From 6c91633293832ba7bf1364924782011e7d133146 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jan 2018 16:39:14 +0100
Subject: [PATCH 288/322] Update flake8-docstrings from 1.1.0 to 1.3.0

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index f73294005..6acc0c022 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -8,7 +8,7 @@ flake8-comprehensions==1.4.1
 flake8-copyright==0.2.0
 flake8-debugger==3.0.0
 flake8-deprecated==1.3
-flake8-docstrings==1.1.0
+flake8-docstrings==1.3.0
 flake8-future-import==0.4.3
 flake8-mock==0.3
 flake8-per-file-ignores==0.4

From f836b615c1fc7e4333793dc8459420788b62ecdf Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jan 2018 16:39:15 +0100
Subject: [PATCH 289/322] Update flake8-future-import from 0.4.3 to 0.4.4

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 6acc0c022..0448bee52 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -9,7 +9,7 @@ flake8-copyright==0.2.0
 flake8-debugger==3.0.0
 flake8-deprecated==1.3
 flake8-docstrings==1.3.0
-flake8-future-import==0.4.3
+flake8-future-import==0.4.4
 flake8-mock==0.3
 flake8-per-file-ignores==0.4
 flake8-polyfill==1.0.2

From 8459c662e7cc992780f8c3af92b8d4809131d226 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jan 2018 16:39:17 +0100
Subject: [PATCH 290/322] Update pep8-naming from 0.4.1 to 0.5.0

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 0448bee52..0ae43d663 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -17,7 +17,7 @@ flake8-string-format==0.2.3
 flake8-tidy-imports==1.1.0
 flake8-tuple==0.2.13
 mccabe==0.6.1
-pep8-naming==0.4.1
+pep8-naming==0.5.0
 pycodestyle==2.3.1
 pydocstyle==2.1.1
 pyflakes==1.6.0

From 6a3b5a9d4e8bb25bdd340ca095cbba9571e70b51 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jan 2018 16:39:18 +0100
Subject: [PATCH 291/322] Update setuptools from 38.2.5 to 38.4.0

---
 misc/requirements/requirements-pip.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt
index 42fae6bc9..54cacc3c3 100644
--- a/misc/requirements/requirements-pip.txt
+++ b/misc/requirements/requirements-pip.txt
@@ -3,6 +3,6 @@
 appdirs==1.4.3
 packaging==16.8
 pyparsing==2.2.0
-setuptools==38.2.5
+setuptools==38.4.0
 six==1.11.0
 wheel==0.30.0

From 70ad02b79b55983db691748a75b6403b4eba3532 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jan 2018 16:39:20 +0100
Subject: [PATCH 292/322] Update hypothesis from 3.44.4 to 3.44.13

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 42a5f2b7d..211506ae5 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -11,7 +11,7 @@ fields==5.0.0
 Flask==0.12.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.44.4
+hypothesis==3.44.13
 itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7

From 7b348fe17c7297826dd71fe637fa1d29b9ee25be Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jan 2018 16:39:21 +0100
Subject: [PATCH 293/322] Update pytest-qt from 2.3.0 to 2.3.1

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 211506ae5..e5f9d35af 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -28,7 +28,7 @@ pytest-cov==2.5.1
 pytest-faulthandler==1.3.1
 pytest-instafail==0.3.0
 pytest-mock==1.6.3
-pytest-qt==2.3.0
+pytest-qt==2.3.1
 pytest-repeat==0.4.1
 pytest-rerunfailures==4.0
 pytest-travis-fold==1.3.0

From c1855e1741298f4a27d89ba71e243c403233a6da Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 10 Jan 2018 09:34:00 +0100
Subject: [PATCH 294/322] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 4e51f1c5b..47bf1e8e8 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -134,6 +134,7 @@ Fixed
 - Fix crash when a subprocess outputs data which is not decodable as UTF-8.
 - Fix crash when closing a tab immediately after hinting.
 - Worked around issues in Qt 5.10 with loading progress never being finished.
+- Fixed a crash when writing a flag before a command (e.g. `:-w open `).
 
 Deprecated
 ~~~~~~~~~~

From 1f8d6e21682a4c18c305aa28f3c6a1135b44aade Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 10 Jan 2018 09:39:46 +0100
Subject: [PATCH 295/322] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 47bf1e8e8..8c3a533a2 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -110,6 +110,7 @@ Changed
   order, and mixed matches on URL/tite are possible.
 - The system's default encoding (rather than UTF-8) is now used to decode
   subprocess output.
+- qutebrowser now ensures it's focused again after an external editor is closed.
 
 Fixed
 ~~~~~

From 5003432a554aa3714954aa41d67705ecf1fbd1fa Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Wed, 10 Jan 2018 19:59:34 +0100
Subject: [PATCH 296/322] option to close commandline by deleting the prefix

---
 .vscode/launch.json                         | 186 ++++++++++++++++++++
 .vscode/settings.json                       |   3 +
 qutebrowser/config/configdata.yml           |   7 +-
 qutebrowser/mainwindow/statusbar/command.py |  16 +-
 4 files changed, 209 insertions(+), 3 deletions(-)
 create mode 100644 .vscode/launch.json
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 000000000..65608537d
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,186 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${file}",
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": [
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Python: Attach",
+            "type": "python",
+            "request": "attach",
+            "localRoot": "${workspaceFolder}",
+            "remoteRoot": "${workspaceFolder}",
+            "port": 3000,
+            "secret": "my_secret",
+            "host": "localhost"
+        },
+        {
+            "name": "Python: Terminal (integrated)",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${file}",
+            "cwd": "",
+            "console": "integratedTerminal",
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": []
+        },
+        {
+            "name": "Python: Terminal (external)",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${file}",
+            "cwd": "",
+            "console": "externalTerminal",
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": []
+        },
+        {
+            "name": "Python: Django",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${workspaceFolder}/manage.py",
+            "cwd": "${workspaceFolder}",
+            "args": [
+                "runserver",
+                "--noreload",
+                "--nothreading"
+            ],
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": [
+                "RedirectOutput",
+                "DjangoDebugging"
+            ]
+        },
+        {
+            "name": "Python: Flask (0.11.x or later)",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": false,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "fully qualified path fo 'flask' executable. Generally located along with python interpreter",
+            "cwd": "${workspaceFolder}",
+            "env": {
+                "FLASK_APP": "${workspaceFolder}/quickstart/app.py"
+            },
+            "args": [
+                "run",
+                "--no-debugger",
+                "--no-reload"
+            ],
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": [
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Python: Flask (0.10.x or earlier)",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": false,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${workspaceFolder}/run.py",
+            "cwd": "${workspaceFolder}",
+            "args": [],
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": [
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Python: PySpark",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "osx": {
+                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
+            },
+            "windows": {
+                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit.cmd"
+            },
+            "linux": {
+                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
+            },
+            "program": "${file}",
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": [
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Python: Module",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "module": "module.name",
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": [
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Python: Pyramid",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "args": [
+                "${workspaceFolder}/development.ini"
+            ],
+            "debugOptions": [
+                "RedirectOutput",
+                "Pyramid"
+            ]
+        },
+        {
+            "name": "Python: Watson",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${workspaceFolder}/console.py",
+            "cwd": "${workspaceFolder}",
+            "args": [
+                "dev",
+                "runserver",
+                "--noreload=True"
+            ],
+            "env": {},
+            "envFile": "${workspaceFolder}/.env",
+            "debugOptions": [
+                "RedirectOutput"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..a3e76b466
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "${workspaceFolder}/.venv/bin/python"
+}
\ No newline at end of file
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index a118a8b59..a3ae79e2d 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -740,6 +740,11 @@ completion.use_best_match:
   default: false
   desc: Execute the best-matching command on a partial match.
 
+completion.exit_prefix:
+  type: Bool
+  default: false
+  desc: Exit command mode if the prefix gets deleted.
+
 ## downloads
 
 downloads.location.directory:
@@ -2493,4 +2498,4 @@ bindings.commands:
       keyboard.
 
     * register: Entered when qutebrowser is waiting for a register name/key for
-      commands like `:set-mark`.
+      commands like `:set-mark`.
\ No newline at end of file
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index ab8ac7b5d..4611a186c 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -31,7 +31,6 @@ from qutebrowser.config import config
 
 
 class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
-
     """The commandline part of the statusbar.
 
     Attributes:
@@ -55,6 +54,8 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
     show_cmd = pyqtSignal()
     hide_cmd = pyqtSignal()
 
+    prefixes = '/ : ?'
+
     def __init__(self, *, win_id, private, parent=None):
         misc.CommandLineEdit.__init__(self, parent=parent)
         misc.MinimalLineEditMixin.__init__(self)
@@ -68,6 +69,7 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         self.textChanged.connect(self.update_completion)
         self.textChanged.connect(self.updateGeometry)
         self.textChanged.connect(self._incremental_search)
+        self.textChanged.connect(self._exit_prefix)
 
     def prefix(self):
         """Get the currently entered command prefix."""
@@ -219,7 +221,10 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         if not text:
             pass
         elif text[0] in modeparsers.STARTCHARS:
-            super().set_prompt(text[0])
+            if config.val.completion.exit_prefix:
+                super().set_prompt('')
+            else:
+                super().set_prompt(text[0])
         else:
             raise utils.Unreachable("setText got called with invalid text "
                                     "'{}'!".format(text))
@@ -259,3 +264,10 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
 
         if self.prefix() in ['/', '?']:
             self.got_cmd[str].emit(search_prefixes[text[0]] + text[1:])
+
+    @pyqtSlot(str)
+    def _exit_prefix(self, text):
+        if config.val.completion.exit_prefix and
+        (not text or text[0] not in self.prefixes):
+            modeman.leave(self._win_id, usertypes.KeyMode.command,
+                          'prefix deleted', maybe=True)

From be5b8e26329108b6b65ccead3602fa5f3f1841e9 Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Wed, 10 Jan 2018 20:02:39 +0100
Subject: [PATCH 297/322] option to close commandline by deleting the prefix

---
 qutebrowser/mainwindow/statusbar/command.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 4611a186c..145ef3808 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -267,7 +267,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
 
     @pyqtSlot(str)
     def _exit_prefix(self, text):
-        if config.val.completion.exit_prefix and
-        (not text or text[0] not in self.prefixes):
+        if config.val.completion.exit_prefix and (not text or text[0] not in self.prefixes):
             modeman.leave(self._win_id, usertypes.KeyMode.command,
                           'prefix deleted', maybe=True)

From 2c4d2beea347ce19edd4965ec2ba332ca0d38284 Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Wed, 10 Jan 2018 20:14:09 +0100
Subject: [PATCH 298/322] option to close commandline by deleting the prefix

---
 .vscode/launch.json   | 186 ------------------------------------------
 .vscode/settings.json |   3 -
 2 files changed, 189 deletions(-)
 delete mode 100644 .vscode/launch.json
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index 65608537d..000000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Python",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
-            "program": "${file}",
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
-        },
-        {
-            "name": "Python: Attach",
-            "type": "python",
-            "request": "attach",
-            "localRoot": "${workspaceFolder}",
-            "remoteRoot": "${workspaceFolder}",
-            "port": 3000,
-            "secret": "my_secret",
-            "host": "localhost"
-        },
-        {
-            "name": "Python: Terminal (integrated)",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
-            "program": "${file}",
-            "cwd": "",
-            "console": "integratedTerminal",
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": []
-        },
-        {
-            "name": "Python: Terminal (external)",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
-            "program": "${file}",
-            "cwd": "",
-            "console": "externalTerminal",
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": []
-        },
-        {
-            "name": "Python: Django",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
-            "program": "${workspaceFolder}/manage.py",
-            "cwd": "${workspaceFolder}",
-            "args": [
-                "runserver",
-                "--noreload",
-                "--nothreading"
-            ],
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput",
-                "DjangoDebugging"
-            ]
-        },
-        {
-            "name": "Python: Flask (0.11.x or later)",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": false,
-            "pythonPath": "${config:python.pythonPath}",
-            "program": "fully qualified path fo 'flask' executable. Generally located along with python interpreter",
-            "cwd": "${workspaceFolder}",
-            "env": {
-                "FLASK_APP": "${workspaceFolder}/quickstart/app.py"
-            },
-            "args": [
-                "run",
-                "--no-debugger",
-                "--no-reload"
-            ],
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
-        },
-        {
-            "name": "Python: Flask (0.10.x or earlier)",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": false,
-            "pythonPath": "${config:python.pythonPath}",
-            "program": "${workspaceFolder}/run.py",
-            "cwd": "${workspaceFolder}",
-            "args": [],
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
-        },
-        {
-            "name": "Python: PySpark",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "osx": {
-                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
-            },
-            "windows": {
-                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit.cmd"
-            },
-            "linux": {
-                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
-            },
-            "program": "${file}",
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
-        },
-        {
-            "name": "Python: Module",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
-            "module": "module.name",
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
-        },
-        {
-            "name": "Python: Pyramid",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "args": [
-                "${workspaceFolder}/development.ini"
-            ],
-            "debugOptions": [
-                "RedirectOutput",
-                "Pyramid"
-            ]
-        },
-        {
-            "name": "Python: Watson",
-            "type": "python",
-            "request": "launch",
-            "stopOnEntry": true,
-            "pythonPath": "${config:python.pythonPath}",
-            "program": "${workspaceFolder}/console.py",
-            "cwd": "${workspaceFolder}",
-            "args": [
-                "dev",
-                "runserver",
-                "--noreload=True"
-            ],
-            "env": {},
-            "envFile": "${workspaceFolder}/.env",
-            "debugOptions": [
-                "RedirectOutput"
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index a3e76b466..000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "python.pythonPath": "${workspaceFolder}/.venv/bin/python"
-}
\ No newline at end of file

From 1db4309eec97f58956f99338be6c1c181e633a9c Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Wed, 10 Jan 2018 21:29:31 +0100
Subject: [PATCH 299/322] review 1

---
 qutebrowser/config/configdata.yml           |  8 ++------
 qutebrowser/mainwindow/statusbar/command.py | 19 ++-----------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index a3ae79e2d..1d94f1000 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -740,11 +740,6 @@ completion.use_best_match:
   default: false
   desc: Execute the best-matching command on a partial match.
 
-completion.exit_prefix:
-  type: Bool
-  default: false
-  desc: Exit command mode if the prefix gets deleted.
-
 ## downloads
 
 downloads.location.directory:
@@ -2498,4 +2493,5 @@ bindings.commands:
       keyboard.
 
     * register: Entered when qutebrowser is waiting for a register name/key for
-      commands like `:set-mark`.
\ No newline at end of file
+      commands like `:set-mark`.
+
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 145ef3808..c0accd3f4 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -31,6 +31,7 @@ from qutebrowser.config import config
 
 
 class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
+
     """The commandline part of the statusbar.
 
     Attributes:
@@ -54,8 +55,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
     show_cmd = pyqtSignal()
     hide_cmd = pyqtSignal()
 
-    prefixes = '/ : ?'
-
     def __init__(self, *, win_id, private, parent=None):
         misc.CommandLineEdit.__init__(self, parent=parent)
         misc.MinimalLineEditMixin.__init__(self)
@@ -216,20 +215,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
             self.clear_completion_selection.emit()
             self.hide_completion.emit()
 
-    def setText(self, text):
-        """Extend setText to set prefix and make sure the prompt is ok."""
-        if not text:
-            pass
-        elif text[0] in modeparsers.STARTCHARS:
-            if config.val.completion.exit_prefix:
-                super().set_prompt('')
-            else:
-                super().set_prompt(text[0])
-        else:
-            raise utils.Unreachable("setText got called with invalid text "
-                                    "'{}'!".format(text))
-        super().setText(text)
-
     def keyPressEvent(self, e):
         """Override keyPressEvent to ignore Return key presses.
 
@@ -267,6 +252,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
 
     @pyqtSlot(str)
     def _exit_prefix(self, text):
-        if config.val.completion.exit_prefix and (not text or text[0] not in self.prefixes):
+        if not text:
             modeman.leave(self._win_id, usertypes.KeyMode.command,
                           'prefix deleted', maybe=True)

From 9fd2ad9909e9351526319458aa6fdf03653fd2dc Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Wed, 10 Jan 2018 21:34:19 +0100
Subject: [PATCH 300/322] review 1

---
 qutebrowser/config/configdata.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 1d94f1000..a118a8b59 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -2494,4 +2494,3 @@ bindings.commands:
 
     * register: Entered when qutebrowser is waiting for a register name/key for
       commands like `:set-mark`.
-

From 860b22c0e05cba376c6cc6320eb7d21a1c5c9ffe Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Wed, 10 Jan 2018 22:05:14 +0100
Subject: [PATCH 301/322] review 1

---
 qutebrowser/mainwindow/statusbar/command.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index c0accd3f4..acdfebfa1 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -26,7 +26,7 @@ from qutebrowser.keyinput import modeman, modeparsers
 from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.misc import cmdhistory, editor
 from qutebrowser.misc import miscwidgets as misc
-from qutebrowser.utils import usertypes, log, objreg, message, utils
+from qutebrowser.utils import usertypes, log, objreg, message
 from qutebrowser.config import config
 
 

From 4932323d3b120275f3abd1e5092462235c2b63fe Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Thu, 11 Jan 2018 12:40:20 +0100
Subject: [PATCH 302/322] review 1 setText

---
 qutebrowser/mainwindow/statusbar/command.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index acdfebfa1..e78db4c3f 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -26,7 +26,7 @@ from qutebrowser.keyinput import modeman, modeparsers
 from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.misc import cmdhistory, editor
 from qutebrowser.misc import miscwidgets as misc
-from qutebrowser.utils import usertypes, log, objreg, message
+from qutebrowser.utils import usertypes, log, objreg, message, utils
 from qutebrowser.config import config
 
 
@@ -215,6 +215,13 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
             self.clear_completion_selection.emit()
             self.hide_completion.emit()
 
+    def setText(self, text):
+        """Extend setText to make sure the prefix is valid."""
+        if text and text[0] not in modeparsers.STARTCHARS:
+            raise utils.Unreachable("setText got called with invalid text "
+                                    "'{}'!".format(text))
+        super().setText(text)
+
     def keyPressEvent(self, e):
         """Override keyPressEvent to ignore Return key presses.
 
@@ -252,6 +259,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
 
     @pyqtSlot(str)
     def _exit_prefix(self, text):
-        if not text:
+        if not text or text[0] not in modeparsers.STARTCHARS:
             modeman.leave(self._win_id, usertypes.KeyMode.command,
                           'prefix deleted', maybe=True)

From 66d05916846833994fdb5bfd6e72e628fa84e2c1 Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Thu, 11 Jan 2018 14:03:43 +0100
Subject: [PATCH 303/322] new method

---
 .vscode/settings.json                       |  3 +++
 qutebrowser/mainwindow/statusbar/command.py | 23 ++++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..73eaca730
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "${workspaceFolder}/.venv/bin/python3.5"
+}
\ No newline at end of file
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index e78db4c3f..76e829a45 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -68,7 +68,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         self.textChanged.connect(self.update_completion)
         self.textChanged.connect(self.updateGeometry)
         self.textChanged.connect(self._incremental_search)
-        self.textChanged.connect(self._exit_prefix)
 
     def prefix(self):
         """Get the currently entered command prefix."""
@@ -222,6 +221,17 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
                                     "'{}'!".format(text))
         super().setText(text)
 
+    def setText(self, text):
+        """Extend setText to set prefix and make sure the prompt is ok."""
+        if not text:
+            pass
+        elif text[0] in modeparsers.STARTCHARS:
+            super().set_prompt(text[0])
+        else:
+            raise utils.Unreachable("setText got called with invalid text "
+                                    "'{}'!".format(text))
+        super().setText(text)
+
     def keyPressEvent(self, e):
         """Override keyPressEvent to ignore Return key presses.
 
@@ -229,6 +239,11 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         Enter/Shift+Enter/etc. will cause QLineEdit to think it's finished
         without command_accept to be called.
         """
+        text = self.text()
+        if text in modeparsers.STARTCHARS and e.key() == Qt.Key_Backspace:
+            modeman.leave(self._win_id, usertypes.KeyMode.command,
+                          'prefix deleted')
+
         if e.key() == Qt.Key_Return:
             e.ignore()
             return
@@ -256,9 +271,3 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
 
         if self.prefix() in ['/', '?']:
             self.got_cmd[str].emit(search_prefixes[text[0]] + text[1:])
-
-    @pyqtSlot(str)
-    def _exit_prefix(self, text):
-        if not text or text[0] not in modeparsers.STARTCHARS:
-            modeman.leave(self._win_id, usertypes.KeyMode.command,
-                          'prefix deleted', maybe=True)

From e654abf1282a013e8e3df9fba26845c98c276101 Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Thu, 11 Jan 2018 14:05:18 +0100
Subject: [PATCH 304/322] deleted folder

---
 .vscode/settings.json | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 73eaca730..000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "python.pythonPath": "${workspaceFolder}/.venv/bin/python3.5"
-}
\ No newline at end of file

From 2d7dd391a3f134c0bd467aae1863c340a15d038d Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Thu, 11 Jan 2018 14:08:17 +0100
Subject: [PATCH 305/322] review 1

---
 qutebrowser/mainwindow/statusbar/command.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 76e829a45..4e8c55d9c 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -213,14 +213,7 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
             self.hide_cmd.emit()
             self.clear_completion_selection.emit()
             self.hide_completion.emit()
-
-    def setText(self, text):
-        """Extend setText to make sure the prefix is valid."""
-        if text and text[0] not in modeparsers.STARTCHARS:
-            raise utils.Unreachable("setText got called with invalid text "
-                                    "'{}'!".format(text))
-        super().setText(text)
-
+       
     def setText(self, text):
         """Extend setText to set prefix and make sure the prompt is ok."""
         if not text:

From 200b36bd362ebb7225eb6175396030ca37eca2cc Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Thu, 11 Jan 2018 14:09:08 +0100
Subject: [PATCH 306/322] review 1

---
 qutebrowser/mainwindow/statusbar/command.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 4e8c55d9c..6ea9b5552 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -213,7 +213,7 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
             self.hide_cmd.emit()
             self.clear_completion_selection.emit()
             self.hide_completion.emit()
-       
+
     def setText(self, text):
         """Extend setText to set prefix and make sure the prompt is ok."""
         if not text:

From 57e8b428c3b81037091a82758248313bebad3fac Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Thu, 11 Jan 2018 15:45:44 +0100
Subject: [PATCH 307/322] e.accept() and return

---
 qutebrowser/mainwindow/statusbar/command.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 6ea9b5552..056203290 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -234,9 +234,10 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         """
         text = self.text()
         if text in modeparsers.STARTCHARS and e.key() == Qt.Key_Backspace:
+            e.accept()
             modeman.leave(self._win_id, usertypes.KeyMode.command,
                           'prefix deleted')
-
+            return 
         if e.key() == Qt.Key_Return:
             e.ignore()
             return

From d9741d56c5ab9b1fd72920ce70c45e269e7bf26f Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Thu, 11 Jan 2018 16:38:55 +0100
Subject: [PATCH 308/322] removed a trailing whitespace

---
 qutebrowser/mainwindow/statusbar/command.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 056203290..26ba802c0 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -237,7 +237,7 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
             e.accept()
             modeman.leave(self._win_id, usertypes.KeyMode.command,
                           'prefix deleted')
-            return 
+            return
         if e.key() == Qt.Key_Return:
             e.ignore()
             return

From 699abef159a9fb8c5cedbc496ac29f45ab24b788 Mon Sep 17 00:00:00 2001
From: Christian Helbling <helbling@search.ch>
Date: Fri, 12 Jan 2018 10:54:05 +0100
Subject: [PATCH 309/322] fix regression of #2778 which reappeared with qt 5.10
 in combination with up-to-date KDE this should also avoid an unneccessary KDE
 maximize animation when exiting fullscreen into maximized

---
 qutebrowser/browser/commands.py      | 2 +-
 qutebrowser/mainwindow/mainwindow.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 3fffbcfb7..34b7fa340 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -2201,6 +2201,6 @@ class CommandDispatcher:
                 window.state_before_fullscreen & ~Qt.WindowFullScreen)
         else:
             window.state_before_fullscreen = window.windowState()
-            window.showFullScreen()
+            window.setWindowState(Qt.WindowFullScreen | window.state_before_fullscreen)
         log.misc.debug('state before fullscreen: {}'.format(
             debug.qflags_key(Qt, window.state_before_fullscreen)))
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index dff465c41..e853c3ea8 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -498,7 +498,7 @@ class MainWindow(QWidget):
         if not config.val.content.windowed_fullscreen:
             if on:
                 self.state_before_fullscreen = self.windowState()
-                self.showFullScreen()
+                self.setWindowState(Qt.WindowFullScreen | self.state_before_fullscreen)
             elif self.isFullScreen():
                 self.setWindowState(self.state_before_fullscreen)
         log.misc.debug('on: {}, state before fullscreen: {}'.format(

From 559059d244ccf95c56bd1c6f982f700ce13aa038 Mon Sep 17 00:00:00 2001
From: Christian Helbling <helbling@search.ch>
Date: Fri, 12 Jan 2018 11:21:55 +0100
Subject: [PATCH 310/322] simplify code - state_before_fullscreen seems not to
 be needed anymore

---
 qutebrowser/browser/commands.py      |  8 ++------
 qutebrowser/mainwindow/mainwindow.py | 10 ++--------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 34b7fa340..139ed93fc 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -2197,10 +2197,6 @@ class CommandDispatcher:
 
         window = self._tabbed_browser.window()
         if window.isFullScreen():
-            window.setWindowState(
-                window.state_before_fullscreen & ~Qt.WindowFullScreen)
+            window.setWindowState(window.windowState() & ~Qt.WindowFullScreen)
         else:
-            window.state_before_fullscreen = window.windowState()
-            window.setWindowState(Qt.WindowFullScreen | window.state_before_fullscreen)
-        log.misc.debug('state before fullscreen: {}'.format(
-            debug.qflags_key(Qt, window.state_before_fullscreen)))
+            window.setWindowState(window.windowState() | Qt.WindowFullScreen)
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index e853c3ea8..726a2f152 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -134,7 +134,6 @@ class MainWindow(QWidget):
     Attributes:
         status: The StatusBar widget.
         tabbed_browser: The TabbedBrowser widget.
-        state_before_fullscreen: window state before activation of fullscreen.
         _downloadview: The DownloadView widget.
         _vbox: The main QVBoxLayout.
         _commandrunner: The main CommandRunner instance.
@@ -234,8 +233,6 @@ class MainWindow(QWidget):
 
         objreg.get("app").new_window.emit(self)
 
-        self.state_before_fullscreen = self.windowState()
-
     def _init_geometry(self, geometry):
         """Initialize the window geometry or load it from disk."""
         if geometry is not None:
@@ -497,12 +494,9 @@ class MainWindow(QWidget):
     def _on_fullscreen_requested(self, on):
         if not config.val.content.windowed_fullscreen:
             if on:
-                self.state_before_fullscreen = self.windowState()
-                self.setWindowState(Qt.WindowFullScreen | self.state_before_fullscreen)
+                self.setWindowState(self.windowState() | Qt.WindowFullScreen)
             elif self.isFullScreen():
-                self.setWindowState(self.state_before_fullscreen)
-        log.misc.debug('on: {}, state before fullscreen: {}'.format(
-            on, debug.qflags_key(Qt, self.state_before_fullscreen)))
+                self.setWindowState(self.windowState() & ~Qt.WindowFullScreen)
 
     @cmdutils.register(instance='main-window', scope='window')
     @pyqtSlot()

From 141d020ede5a26cd7626d3c4555e0f2917edd342 Mon Sep 17 00:00:00 2001
From: Christian Helbling <helbling@search.ch>
Date: Sat, 13 Jan 2018 10:07:21 +0100
Subject: [PATCH 311/322] import debug is not needed anymore

---
 qutebrowser/browser/commands.py      | 2 +-
 qutebrowser/mainwindow/mainwindow.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 139ed93fc..edc25ea49 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -39,7 +39,7 @@ from qutebrowser.browser import (urlmarks, browsertab, inspector, navigate,
                                  webelem, downloads)
 from qutebrowser.keyinput import modeman
 from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils,
-                               objreg, utils, debug, standarddir)
+                               objreg, utils, standarddir)
 from qutebrowser.utils.usertypes import KeyMode
 from qutebrowser.misc import editor, guiprocess
 from qutebrowser.completion.models import urlmodel, miscmodels
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 726a2f152..a5faf6dd1 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -30,7 +30,7 @@ from PyQt5.QtWidgets import QWidget, QVBoxLayout, QApplication, QSizePolicy
 from qutebrowser.commands import runners, cmdutils
 from qutebrowser.config import config, configfiles
 from qutebrowser.utils import (message, log, usertypes, qtutils, objreg, utils,
-                               jinja, debug)
+                               jinja)
 from qutebrowser.mainwindow import messageview, prompt
 from qutebrowser.completion import completionwidget, completer
 from qutebrowser.keyinput import modeman

From cd20c32973d44ea8b27957165936b87c459d1925 Mon Sep 17 00:00:00 2001
From: Christian Helbling <helbling@search.ch>
Date: Sat, 13 Jan 2018 10:26:41 +0100
Subject: [PATCH 312/322] simplify more

---
 qutebrowser/browser/commands.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index edc25ea49..f6f36b68e 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -2196,7 +2196,4 @@ class CommandDispatcher:
             return
 
         window = self._tabbed_browser.window()
-        if window.isFullScreen():
-            window.setWindowState(window.windowState() & ~Qt.WindowFullScreen)
-        else:
-            window.setWindowState(window.windowState() | Qt.WindowFullScreen)
+        window.setWindowState(window.windowState() ^ Qt.WindowFullScreen)

From 8c8cb3bc293dab0908706b6034aab1d2dcddd4e5 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 14 Jan 2018 20:20:51 +0100
Subject: [PATCH 313/322] Fix crash when clicking <form> element with
 name="value" child

https://stackoverflow.com/q/22942689/2085149

Fixes #2877
See #2569
---
 doc/changelog.asciidoc                    |  1 +
 qutebrowser/javascript/.eslintrc.yaml     |  2 +-
 qutebrowser/javascript/webelem.js         | 17 +++++++++++++++--
 tests/end2end/data/issue2569.html         |  4 ++++
 tests/end2end/features/javascript.feature |  6 ++++++
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 8c3a533a2..ac7b33ec8 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -136,6 +136,7 @@ Fixed
 - Fix crash when closing a tab immediately after hinting.
 - Worked around issues in Qt 5.10 with loading progress never being finished.
 - Fixed a crash when writing a flag before a command (e.g. `:-w open `).
+- Fixed a crash when clicking certain form elements with QtWebEngine.
 
 Deprecated
 ~~~~~~~~~~
diff --git a/qutebrowser/javascript/.eslintrc.yaml b/qutebrowser/javascript/.eslintrc.yaml
index 6fdd16639..2e4de98fc 100644
--- a/qutebrowser/javascript/.eslintrc.yaml
+++ b/qutebrowser/javascript/.eslintrc.yaml
@@ -33,7 +33,7 @@ rules:
      no-extra-parens: off
      id-length: ["error", {"exceptions": ["i", "k", "x", "y"]}]
      object-shorthand: "off"
-     max-statements: ["error", {"max": 30}]
+     max-statements: ["error", {"max": 40}]
      quotes: ["error", "double", {"avoidEscape": true}]
      object-property-newline: ["error", {"allowMultiplePropertiesPerLine": true}]
      comma-dangle: ["error", "always-multiline"]
diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index b5fd936b2..61b537504 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -66,13 +66,14 @@ window._qutebrowser.webelem = (function() {
 
         const out = {
             "id": id,
-            "value": elem.value,
-            "outer_xml": elem.outerHTML,
             "rects": [],  // Gets filled up later
             "caret_position": caret_position,
         };
 
+        // Deal with various fun things which can happen in form elements
         // https://github.com/qutebrowser/qutebrowser/issues/2569
+        // https://github.com/qutebrowser/qutebrowser/issues/2877
+        // https://stackoverflow.com/q/22942689/2085149
         if (typeof elem.tagName === "string") {
             out.tag_name = elem.tagName;
         } else if (typeof elem.nodeName === "string") {
@@ -88,6 +89,18 @@ window._qutebrowser.webelem = (function() {
             out.class_name = "";
         }
 
+        if (typeof elem.value === "string" || typeof elem.value === "number") {
+            out.value = elem.value;
+        } else {
+            out.value = "";
+        }
+
+        if (typeof elem.outerHTML === "string") {
+            out.outer_xml = elem.outerHTML;
+        } else {
+            out.outer_xml = "";
+        }
+
         if (typeof elem.textContent === "string") {
             out.text = elem.textContent;
         } else if (typeof elem.text === "string") {
diff --git a/tests/end2end/data/issue2569.html b/tests/end2end/data/issue2569.html
index 8f613be2d..a21690bd6 100644
--- a/tests/end2end/data/issue2569.html
+++ b/tests/end2end/data/issue2569.html
@@ -15,6 +15,10 @@
         <form id="textform">
             <input name="text" type="text">
         </form>
+        <!-- Happens on the GitHub "new file" page -->
+        <form id="valueform">
+            <input name="value" type="text">
+        </form>
         <!-- Some regressions after we added type checking -->
         <svg xmlns="http://www.w3.org/2000/svg" width="30" height="20" viewBox="0 0 3 2" id="icon">
             <rect width="1" height="2" x="0" fill="#008d46" />
diff --git a/tests/end2end/features/javascript.feature b/tests/end2end/features/javascript.feature
index 3ccd50efb..c74811b4b 100644
--- a/tests/end2end/features/javascript.feature
+++ b/tests/end2end/features/javascript.feature
@@ -90,6 +90,12 @@ Feature: Javascript stuff
         And I wait for "Sending fake click to *" in the log
         Then no crash should happen
 
+    Scenario: Clicking on form element with value child
+        When I open data/issue2569.html
+        And I run :click-element id valueform
+        And I wait for "Sending fake click to *" in the log
+        Then no crash should happen
+
     Scenario: Clicking on svg element
         When I open data/issue2569.html
         And I run :click-element id icon

From f2beaa455e0d40c94ed4a8f28e3e081cefd0bb12 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 15 Jan 2018 16:44:12 +0100
Subject: [PATCH 314/322] Update hypothesis from 3.44.13 to 3.44.16

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index e5f9d35af..574dbdb28 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -11,7 +11,7 @@ fields==5.0.0
 Flask==0.12.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.44.13
+hypothesis==3.44.16
 itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7

From d3f3be03ddeba658a3e244aefd9a62e25c444bef Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 15 Jan 2018 19:29:14 +0100
Subject: [PATCH 315/322] Update changelog for v1.1.0

---
 doc/changelog.asciidoc | 101 +++++++++++++++++++++--------------------
 1 file changed, 52 insertions(+), 49 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index ac7b33ec8..de5697679 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -15,8 +15,8 @@ breaking changes (such as renamed commands) can happen in minor releases.
 // `Fixed` for any bug fixes.
 // `Security` to invite users to upgrade in case of vulnerabilities.
 
-v1.1.0 (unreleased)
--------------------
+v1.1.0
+------
 
 Added
 ~~~~~
@@ -26,43 +26,50 @@ Added
 - There's now a `misc/Makefile` file in releases, which should help
   distributions which package qutebrowser, as they can run something like
   `make -f misc/Makefile DESTDIR="$pkgdir" install` now.
-- New `{current_url}` field for `window.title_format` and `tabs.title.format`.
-- New `colors.statusbar.passthrough.fg`/`.bg` settings.
-- New `completion.delay` and `completion.min_chars` settings to update the
-  completion less often.
-- New `completion.use_best_match` setting to automatically use the best-matching
-  command in the completion.
-- New `:tab-give` and `:tab-take` commands, to give tabs to another window, or
-  take them from another window.
+- New fields for `window.title_format` and `tabs.title.format`:
+  * `{current_url}`
+  * `{protocol}`
+- New settings:
+  * `colors.statusbar.passthrough.fg`/`.bg`
+  * `completion.delay` and `completion.min_chars` to update the completion less
+    often.
+  * `completion.use_best_match` to automatically use the best-matching
+    command in the completion.
+  * `keyhint.radius` to configure the edge rounding for the key hint widget.
+  * `qt.highdpi` to turn on Qt's High-DPI scaling.
+  * `tabs.pinned.shrink` (`true` by default) to make it possible
+    for pinned tabs and normal tabs to have the same size.
+  * `content.windowed_fullscreen` to show e.g. a fullscreened video in the
+    window without fullscreening that window.
+  * `tabs.persist_mode_on_change` to keep the current mode when
+    switching tabs.
+  * `session.lazy_restore` which allows to not load pages immediately
+    when restoring a session.
+- New commands:
+  * `:tab-give` and `:tab-take`, to give tabs to another window, or take them
+    from another window.
+  * `:completion-item-yank` (bound to `<Ctrl-C>`) to yank the current
+    completion item text.
+  * `:edit-command` to edit the commandline in an editor.
+  * `search.incremental` for incremental text search.
+- New flags for existing commands:
+  * `-o` flag for `:spawn` to show stdout/stderr in a new tab.
+  * `--rapid` flag for `:command-accept` (bound to `Ctrl-Enter` by default),
+    which allows executing a command in the completion without closing it.
+  * `--private` and `--related` flags for `:edit-url`, which have the
+    same effect they have with `:open`.
+  * `--history` for `:completion-item-focus` which causes it to go
+    through the command history when no text was entered. The default bindings for
+    cursor keys in the completion changed to use that, so that they can be used
+    again to navigate through completion items when a text was entered.
+  * `--file` for `:debug-pyeval` which makes it take a filename instead of a
+    line of code.
 - New `config.source(...)` method for `config.py` to source another file.
-- New `keyhint.radius` option to configure the edge rounding for the key hint
-  widget.
-- `:edit-url` now handles the `--private` and `--related` flags, which have the
-  same effect they have with `:open`.
 - New `{line}` and `{column}` replacements for `editor.command` to position the
   cursor correctly.
 - New `qute-pass` userscript as alternative to `password_fill` which allows
   selecting accounts via rofi or any other dmenu-compatile application.
-- New `qt.highdpi` setting to turn on Qt's High-DPI scaling.
-- New `:completion-item-yank` command (bound to `<Ctrl-C>`) to yank the current
-  completion item text.
-- New `tabs.pinned.shrink` setting to (`true` by default) to make it possible
-  for pinned tabs and normal tabs to have the same size.
-- New `content.windowed_fullscreen` setting to show e.g. a fullscreened video in
-  the window without fullscreening that window.
-- New `:edit-command` command to edit the commandline in an editor.
-- New `tabs.persist_mode_on_change` setting to keep the current mode when
-  switching tabs.
-- New `session.lazy_restore` setting which allows to not load pages immediately
-  when restoring a session.
 - New `hist_importer.py` script to import history from Firefox/Chromium.
-- New `{protocol}` replacement for `tabs.title.format` and friends.
-- New `-o` flag for `:spawn` to show stdout/stderr in a new tab.
-- Support for incremental search, with a new `search.incremental` setting.
-- New `--rapid` flag for `:command-accept` (bound to `Ctrl-Enter` by default),
-  which allows executing a command in the completion without closing it.
-- The `colors.completion.fg` setting can now be a list, allowing to specify
-  different colors for the three completion columns.
 
 Changed
 ~~~~~~~
@@ -73,13 +80,15 @@ Changed
   * `tabs.indicator_padding` -> `tabs.indicator.padding`
   * `session_default_name` -> `session.default_name`
   * `ignore_case` -> `search.ignore_case`
+- Much improved user stylesheet handling for QtWebEngine which reduces
+  flickering and updates immediately after setting a stylesheet.
 - High-DPI favicons are now used when available.
 - The `asciidoc2html.py` script now uses Pygments (which is already a dependency
   of qutebrowser) instead of `source-highlight` for syntax highlighting.
 - The `:buffer` command now doesn't require quoting anymore, similar to `:open`.
 - The `importer.py` script was largely rewritten and now also supports importing
   from Firefox' `places.sqlite` file and Chrome/Chromium profiles.
-- Various internal refactorings to use Python 3.5 and ECMAscript 6 features
+- Various internal refactorings to use Python 3.5 and ECMAscript 6 features.
 - If the `window.hide_wayland_decoration` setting is False, but
   `QT_WAYLAND_DISABLE_WINDOWDECORATION` is set in the environment,
   the decorations are still hidden.
@@ -91,17 +100,9 @@ Changed
 - The `qute://version` page now also shows the uptime of qutebrowser.
 - qutebrowser now prompts to create a non-existing directory when starting a
   download.
-- Much improved user stylesheet handling which reduces flickering
-  and updates immediately after setting a stylesheet.
-- `:completion-item-focus` now has a `--history` flag which causes it to go
-  through the command history when no text was entered. The default bindings for
-  cursor keys in the completion changed to use that, so that they can be used
-  again to navigate through completion items when a text was entered.
-- `:debug-pyeval` now has a `--file` argument so it takes a filename instead of
-  a line of code.
-- `:jseval --file` now searches relative paths in a js/ subdir in qutebrowser's
-  data dir, e.g. `~/.local/share/qutebrowser/js`.
-- The current/default bindings are now shown in the :bind completion.
+- `:jseval --file` now searches relative paths in a `js/` subdir in
+  qutebrowser's data dir, e.g. `~/.local/share/qutebrowser/js`.
+- The current/default bindings are now shown in the ``:bind` completion.
 - Empty categories are now hidden in the `:open` completion.
 - Search terms for URLs and titles can now be mixed when filtering the
   completion.
@@ -111,27 +112,29 @@ Changed
 - The system's default encoding (rather than UTF-8) is now used to decode
   subprocess output.
 - qutebrowser now ensures it's focused again after an external editor is closed.
+- The `colors.completion.fg` setting can now be a list, allowing to specify
+  different colors for the three completion columns.
 
 Fixed
 ~~~~~
 
 - More consistent sizing for favicons with vertical tabs.
 - Using `:home` on pinned tabs is now prevented.
-- Fix crash with unknown file types loaded via qute://help.
+- Fix crash with unknown file types loaded via `qute://help`.
 - Scrolling performance improvements.
 - Sites like `qute://help` now redirect to `qute://help/` to make sure links
   work properly.
 - Fixes for the size calculation of pinned tabs in the tab bar.
 - Worked around a crash with PyQt 5.9.1 compiled against Qt < 5.9.1 when using
-  :yank or qute:// URLs.
-- Fixed crash when opening `qute://help/img`
+  `:yank` or `qute://` URLs.
+- Fixed crash when opening `qute://help/img`.
 - Fixed `gU` (`:navigate up`) on `qute://help` and webservers not handling `..`
   in a URL.
 - Using e.g. `-s backend webkit` to set the backend now works correctly.
 - Fixed crash when closing the tab an external editor was opened in.
 - When using `:search-next` before a search is finished, no warning about no
   results being found is shown anymore.
-- Fix :click-element with an ID containing non-alphanumeric characters.
+- Fix `:click-element` with an ID containing non-alphanumeric characters.
 - Fix crash when a subprocess outputs data which is not decodable as UTF-8.
 - Fix crash when closing a tab immediately after hinting.
 - Worked around issues in Qt 5.10 with loading progress never being finished.

From fbbb9ae9408d2e4bdabd0b90e3275af387c383d8 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 15 Jan 2018 19:39:16 +0100
Subject: [PATCH 316/322] Release v1.1.0

---
 qutebrowser/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py
index 6859abedc..1b1ec4c40 100644
--- a/qutebrowser/__init__.py
+++ b/qutebrowser/__init__.py
@@ -26,7 +26,7 @@ __copyright__ = "Copyright 2014-2017 Florian Bruhin (The Compiler)"
 __license__ = "GPL"
 __maintainer__ = __author__
 __email__ = "mail@qutebrowser.org"
-__version_info__ = (1, 0, 4)
+__version_info__ = (1, 1, 0)
 __version__ = '.'.join(str(e) for e in __version_info__)
 __description__ = "A keyboard-driven, vim-like browser based on PyQt5."
 

From d06f07af80f1858d960d4ea6edd71546da280d93 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 15 Jan 2018 22:42:12 +0100
Subject: [PATCH 317/322] Fix Makefile and make sure it's tested

Fixes #3492
---
 doc/changelog.asciidoc       | 8 ++++++++
 misc/Makefile                | 2 +-
 scripts/dev/build_release.py | 9 +++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index de5697679..adcf8fdaa 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -15,6 +15,14 @@ breaking changes (such as renamed commands) can happen in minor releases.
 // `Fixed` for any bug fixes.
 // `Security` to invite users to upgrade in case of vulnerabilities.
 
+v1.1.1 (unreleased)
+-------------------
+
+Fixed
+~~~~~
+
+- The Makefile now actually works.
+
 v1.1.0
 ------
 
diff --git a/misc/Makefile b/misc/Makefile
index fe97eb6bf..714223d10 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -21,5 +21,5 @@ install: doc/qutebrowser.1.html
 		$(wildcard misc/userscripts/*)
 	install -Dm755 -t "$(DESTDIR)/usr/share/qutebrowser/scripts/" \
 		$(filter-out scripts/__init__.py scripts/__pycache__ scripts/dev \
-		  scripts/testbrowser_cpp scripts/asciidoc2html.py scripts/setupcommon.py \
+		  scripts/testbrowser scripts/asciidoc2html.py scripts/setupcommon.py \
 			scripts/link_pyqt.py,$(wildcard scripts/*))
diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py
index ce0ea2b8e..aa4046adc 100755
--- a/scripts/dev/build_release.py
+++ b/scripts/dev/build_release.py
@@ -328,6 +328,14 @@ def build_sdist():
     return artifacts
 
 
+def test_makefile():
+    """Make sure the Makefile works correctly."""
+    utils.print_title("Testing makefile")
+    with tempfile.TemporaryDirectory() as tmpdir:
+        subprocess.run(['make', '-f', 'misc/Makefile',
+                        'DESTDIR={}'.format(tmpdir), 'install'], check=True)
+
+
 def read_github_token():
     """Read the GitHub API token from disk."""
     token_file = os.path.join(os.path.expanduser('~'), '.gh_token')
@@ -403,6 +411,7 @@ def main():
     elif sys.platform == 'darwin':
         artifacts = build_mac()
     else:
+        test_makefile()
         artifacts = build_sdist()
         upload_to_pypi = True
 

From d5f7ec437249d05516fa65832bf27906d9000db7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 17 Jan 2018 11:43:31 +0100
Subject: [PATCH 318/322] Update changelog

---
 doc/changelog.asciidoc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index adcf8fdaa..b451b14e9 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -15,6 +15,15 @@ breaking changes (such as renamed commands) can happen in minor releases.
 // `Fixed` for any bug fixes.
 // `Security` to invite users to upgrade in case of vulnerabilities.
 
+v1.2.0 (unreleased)
+-------------------
+
+Changed
+~~~~~~~
+
+- The `hist_importer.py` script now only imports URL schemes qutebrowser can
+  handle.
+
 v1.1.1 (unreleased)
 -------------------
 

From 54a93dfcf81c280e5168b76d17eabaebafc7011a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 17 Jan 2018 13:27:32 +0100
Subject: [PATCH 319/322] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index b451b14e9..cc53bb2d7 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -23,6 +23,7 @@ Changed
 
 - The `hist_importer.py` script now only imports URL schemes qutebrowser can
   handle.
+- Deleting a prefix (`:`, `/` or `?`) via backspace now leaves command mode.
 
 v1.1.1 (unreleased)
 -------------------

From 06075a49747411c0dad06339e8059856bb56abaa Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 17 Jan 2018 13:38:54 +0100
Subject: [PATCH 320/322] Update docs

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index cc53bb2d7..0fda24662 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -24,6 +24,7 @@ Changed
 - The `hist_importer.py` script now only imports URL schemes qutebrowser can
   handle.
 - Deleting a prefix (`:`, `/` or `?`) via backspace now leaves command mode.
+- Angular 1 elements now get hints assigned.
 
 v1.1.1 (unreleased)
 -------------------

From 23bdee06b3e4184ea734fe55518584f99248c348 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 17 Jan 2018 14:42:13 +0100
Subject: [PATCH 321/322] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 0fda24662..0c5669ba4 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -25,6 +25,7 @@ Changed
   handle.
 - Deleting a prefix (`:`, `/` or `?`) via backspace now leaves command mode.
 - Angular 1 elements now get hints assigned.
+- `:tab-only` with pinned tabs now still closes unpinned tabs.
 
 v1.1.1 (unreleased)
 -------------------

From c86eaa17e2f64f8692ee3d8ca2cca36d0610f8bf Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 17 Jan 2018 15:54:32 +0100
Subject: [PATCH 322/322] Update changelog

---
 doc/changelog.asciidoc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 0c5669ba4..08dc2fbce 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -27,6 +27,11 @@ Changed
 - Angular 1 elements now get hints assigned.
 - `:tab-only` with pinned tabs now still closes unpinned tabs.
 
+Fixed
+~~~~~
+
+- Improved fullscreen handling with Qt 5.10.
+
 v1.1.1 (unreleased)
 -------------------