Add more macOS versions

2018-04-24 10:55:37 +02:00
34 changed files with 163 additions and 652 deletions
--- a/.flake8
+++ b/.flake8
@@ -32,7 +32,7 @@ exclude = .*,__pycache__,resources.py
 # D403: First word of the first line should be properly capitalized
 #       (false-positives)
 # D413: Missing blank line after last section (not in pep257?)
-# A003: Builtin name for class attribute (needed for overridden methods)
+# A003: Builtin name for class attribute (needed for attrs)
 ignore =
    B001,B008,B305,
    E128,E226,E265,E501,E402,E266,E722,E731,
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,10 +30,18 @@ matrix:
           - sourceline: "deb http://us.archive.ubuntu.com/ubuntu/ xenial main universe"
           packages:
           - xvfb
+    - os: osx
+      env: TESTENV=py36 OSX=highsierra
+      osx_image: xcode9.3
+      language: generic
    - os: osx
      env: TESTENV=py36 OSX=sierra
      osx_image: xcode9.2
      language: generic
+    - os: osx
+      env: TESTENV=py36 OSX=elcapitan
+      osx_image: xcode8
+      language: generic
    # https://github.com/qutebrowser/qutebrowser/issues/2013
    # - os: osx
    #   env: TESTENV=py35 OSX=yosemite
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -15,22 +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.3.1
------
-
-Fixed
-~~~~~
-
- Work around a bug in Qt 5.11 where only the top/bottom half of the window is used.
-  This workaround is incomplete, but fixes the majority of the cases where this happens.
- Work around keyboard focus issues with Qt 5.11.
- Work around an issue in Qt 5.11 where e.g. activating JavaScript per-domain
-  needed a manual reload in some cases.
- Don't crash when a ² key is pressed (e.g. on AZERTY keyboards).
- Don't crash when a tab is opened and quickly closed again.
-
-v1.3.0
------
+v1.3.0 (unreleased)
+-------------------

 Added
 ~~~~~
@@ -39,9 +25,7 @@ Added
 - New `url.open_base_url` option to open the base URL of a searchengine when no
  search term is given.
 - New `tabs.min_width` setting to configure the minimal width for tabs.
- New userscripts:
-  * `getbib` to download bibtex information for DOIs on a page.
-  * `qute-keepass` to get passwords from KeePassX.
+- New `getbib` userscript to download bibtex information for DOIs on a page.

 Changed
 ~~~~~~~
@@ -68,6 +52,7 @@ Changed
 - Error messages when trying to wrap when `tabs.wrap` is `False` are now logged
  to debug instead of messages.

+
 Fixed
 ~~~~~

@@ -96,18 +81,7 @@ Fixed
 - The Makefile (intended for packagers) now supports `PREFIX` properly.
 - The workaround for a black window with Nvidia graphics is now enabled on
  non-Linux systems (like FreeBSD) as well.
- Initial support for Qt 5.11.
- Checking for a new version after sending a crash report now works properly
-  again.
- `@match` in Greasemonkey scripts now more closely matches the proper pattern
-  syntax.
- Searching via `/` or `?` now doesn't handle any characters in a special way.
- Fixed crash when trying to retry some failed downloads on QtWebEngine.
- An invalid spellcheck dictionary filename now doesn't crash anymore.
- When no spellcheck dictionaries are configured, it's now disabled internally.
-  This works around an issue with entering special characters on Facebook
-  messenger.
- The macOS release now should work again on macOS 10.11 and newer.
+- Initial support for Qt 5.11

 v1.2.1
 ------
--- a/doc/help/configuring.asciidoc
+++ b/doc/help/configuring.asciidoc
@@ -3,28 +3,44 @@ Configuring qutebrowser

 IMPORTANT: qutebrowser's configuration system was completely rewritten in
 September 2017. This information is not applicable to older releases, and older
-information elsewhere might be outdated.
+information elsewhere might be outdated. **If you had an old configuration
+around and upgraded, this page will automatically open once**. To view it at a
+later time, use the `:help` command.

-qutebrowser's config files
--------------------------
+Migrating older configurations
+------------------------------

-qutebrowser releases before v1.0.0 had a `qutebrowser.conf` and `keys.conf`
-file. Those are not used anymore since that release - see
-<<migrating,"Migrating older configurations">> for information on how to
-migrate to the new config.
+qutebrowser does no automatic migration for the new configuration. However,
+there's a special link:qute://configdiff/old[configdiff] page
+(`qute://configdiff/old`) in qutebrowser, which will show you the changes you
+did in your old configuration, compared to the old defaults.

-When using `:set` and `:bind`, changes are saved to an `autoconfig.yml` file
-automatically. If you don't want to have a config file which is curated by
-hand, you can simply use those - see
-<<autoconfig,"Configuring qutebrowser via the user interface">> for details.
+Other changes in default settings:

-For more advanced configuration, you can write a `config.py` file - see
-<<configpy,"Configuring qutebrowser via config.py">>. As soon as a `config.py`
-exists, the `autoconfig.yml` file **is not read anymore** by default. You need
-to <<configpy-autoconfig,load it by hand>> if you want settings done via
-`:set`/`:bind` to still persist.
+- In v1.1.x and newer, `<Up>` and `<Down>` navigate through command history
+  if no text was entered yet.
+  With v1.0.x, they always navigate through command history instead of selecting
+  completion items. Use `<Tab>`/`<Shift-Tab>` to cycle through the completion
+  instead.
+  You can get back the old behavior by doing:
+
+----
+:bind -m command <Up> completion-item-focus prev
+:bind -m command <Down> completion-item-focus next
+----
+
+or always navigate through command history with
+
+----
+:bind -m command <Up> command-history-prev
+:bind -m command <Down> command-history-next
+----
+
+- The default for `completion.web_history_max_items` is now set to `-1`, showing
+  an unlimited number of items in the completion for `:open` as the new
+  sqlite-based completion is much faster. If the `:open` completion is too slow
+  on your machine, set an appropriate limit again.

-[[autoconfig]]
 Configuring qutebrowser via the user interface
 ----------------------------------------------

@@ -72,7 +88,6 @@ link:commands.html#config-clear[`:config-clear`] to reset the entire configurati
 and link:commands.html#config-cycle[`:config-cycle`] to cycle a setting between
 different values.

-[[configpy]]
 Configuring qutebrowser via config.py
 -------------------------------------

@@ -224,7 +239,6 @@ config.bind(',v', 'spawn mpv {url}')
 To suppress loading of any default keybindings, you can set
 `c.bindings.default = {}`.

-[[configpy-autoconfig]]
 Loading `autoconfig.yml`
 ~~~~~~~~~~~~~~~~~~~~~~~~

@@ -415,38 +429,3 @@ from qutebrowser.config.config import ConfigContainer  # noqa: F401
 config = config  # type: ConfigAPI # noqa: F821 pylint: disable=E0602,C0103
 c = c  # type: ConfigContainer # noqa: F821 pylint: disable=E0602,C0103
 ----
-
-[[migrating]]
-Migrating older configurations
------------------------------
-
-qutebrowser does no automatic migration for the new configuration. However,
-there's a special link:qute://configdiff/old[configdiff] page
-(`qute://configdiff/old`) in qutebrowser, which will show you the changes you
-did in your old configuration, compared to the old defaults.
-
-Other changes in default settings:
-
- In v1.1.x and newer, `<Up>` and `<Down>` navigate through command history
-  if no text was entered yet.
-  With v1.0.x, they always navigate through command history instead of selecting
-  completion items. Use `<Tab>`/`<Shift-Tab>` to cycle through the completion
-  instead.
-  You can get back the old behavior by doing:
-+
----
-:bind -m command <Up> completion-item-focus prev
-:bind -m command <Down> completion-item-focus next
----
-+
-or always navigate through command history with
-+
----
-:bind -m command <Up> command-history-prev
-:bind -m command <Down> command-history-next
----
-
- The default for `completion.web_history_max_items` is now set to `-1`, showing
-  an unlimited number of items in the completion for `:open` as the new
-  sqlite-based completion is much faster. If the `:open` completion is too slow
-  on your machine, set an appropriate limit again.
--- a/misc/requirements/requirements-check-manifest.txt
+++ b/misc/requirements/requirements-check-manifest.txt
@@ -1,3 +1,3 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py

-check-manifest==0.37
+check-manifest==0.36
--- a/misc/requirements/requirements-codecov.txt
+++ b/misc/requirements/requirements-codecov.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py

-certifi==2018.4.16
+certifi==2018.1.18
 chardet==3.0.4
 codecov==2.0.15
 coverage==4.5.1
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -3,7 +3,7 @@
 attrs==17.4.0
 flake8==3.5.0
 flake8-bugbear==18.2.0
-flake8-builtins==1.3.1
+flake8-builtins==1.2.2
 flake8-comprehensions==1.4.1
 flake8-copyright==0.2.0
 flake8-debugger==3.1.0
@@ -19,7 +19,7 @@ flake8-tuple==0.2.13
 mccabe==0.6.1
 pathmatch==0.2.1
 pep8-naming==0.5.0
-pycodestyle==2.3.1  # rq.filter: < 2.4.0
+pycodestyle==2.3.1
 pydocstyle==2.1.1
 pyflakes==1.6.0
 six==1.11.0
--- a/misc/requirements/requirements-flake8.txt-raw
+++ b/misc/requirements/requirements-flake8.txt-raw
@@ -15,6 +15,3 @@ flake8-tuple
 pep8-naming
 pydocstyle
 pyflakes
-
-# https://github.com/PyCQA/pycodestyle/issues/741
-#@ filter: pycodestyle < 2.4.0
--- a/misc/requirements/requirements-pip.txt
+++ b/misc/requirements/requirements-pip.txt
@@ -3,6 +3,6 @@
 appdirs==1.4.3
 packaging==17.1
 pyparsing==2.2.0
-setuptools==39.1.0
+setuptools==39.0.1
 six==1.11.0
 wheel==0.31.0
--- a/misc/requirements/requirements-pylint-master.txt
+++ b/misc/requirements/requirements-pylint-master.txt
@@ -1,9 +1,9 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py

 -e git+https://github.com/PyCQA/astroid.git#egg=astroid
-certifi==2018.4.16
+certifi==2018.1.18
 chardet==3.0.4
-github3.py==1.1.0
+github3.py==1.0.2
 idna==2.6
 isort==4.3.4
 lazy-object-proxy==1.3.1
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -1,9 +1,9 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py

 astroid==1.6.3
-certifi==2018.4.16
+certifi==2018.1.18
 chardet==3.0.4
-github3.py==1.1.0
+github3.py==1.0.2
 idna==2.6
 isort==4.3.4
 lazy-object-proxy==1.3.1
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -2,16 +2,16 @@

 attrs==17.4.0
 beautifulsoup4==4.6.0
-cheroot==6.2.4
+cheroot==6.1.2
 click==6.7
 # colorama==0.3.9
 coverage==4.5.1
 EasyProcess==0.2.3
 fields==5.0.0
-Flask==1.0.1
+Flask==0.12.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.56.5
+hypothesis==3.55.1
 itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7
@@ -22,13 +22,13 @@ parse-type==0.4.2
 pluggy==0.6.0
 py==1.5.3
 py-cpuinfo==4.0.0
-pytest==3.5.1
+pytest==3.5.0
 pytest-bdd==2.21.0
 pytest-benchmark==3.1.1
 pytest-cov==2.5.1
 pytest-faulthandler==1.5.0
 pytest-instafail==0.3.0
-pytest-mock==1.9.0
+pytest-mock==1.8.0
 pytest-qt==2.3.1
 pytest-repeat==0.4.1
 pytest-rerunfailures==4.0
--- a/misc/userscripts/qute-keepass
+++ b/misc/userscripts/qute-keepass
@@ -1,261 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright 2018 Jay Kamat <jaygkamat@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
-# (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/>.
-
-"""This userscript allows for insertion of usernames and passwords from keepass
-databases using pykeepass. Since it is a userscript, it must be run from
-qutebrowser.
-
-A sample invocation of this script is:
-
-:spawn --userscript qute-keepass -p ~/KeePassFiles/MainDatabase.kdbx
-
-And a sample binding
-
-:bind --mode=insert <ctrl-i> spawn --userscript qute-keepass -p ~/KeePassFiles/MainDatabase.kdbx
-
-p or --path is a required argument.
-
--keyfile-path allows you to specify a keepass keyfile. If you only use a
-keyfile, also add --no-password as well. Specifying --no-password without
--keyfile-path will lead to an error.
-
-login information is inserted using :insert-text and :fake-key <Tab>, which
-means you must have a cursor in position before initiating this userscript. If
-you do not do this, you will get 'element not editable' errors.
-
-If keepass takes a while to open the DB, you might want to consider reducing
-the number of transform rounds in your database settings.
-
-Dependencies: pykeepass (in python3), PyQt5. Without pykeepass, you will get an
-exit code of 100.
-
-********************!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!******************
-
-WARNING: The login details are viewable as plaintext in qutebrowser's debug log
-(qute://log) and could be compromised if you decide to submit a crash report!
-
-********************!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!******************
-
-"""
-
-# pylint: disable=bad-builtin
-
-import argparse
-import enum
-import functools
-import os
-import shlex
-import subprocess
-import sys
-
-from PyQt5.QtCore import QUrl
-from PyQt5.QtWidgets import QApplication, QInputDialog, QLineEdit
-
-try:
-    import pykeepass
-except ImportError as e:
-    print("pykeepass not found: {}".format(str(e)), file=sys.stderr)
-
-    # Since this is a common error, try to print it to the FIFO if we can.
-    if 'QUTE_FIFO' in os.environ:
-        with open(os.environ['QUTE_FIFO'], 'w') as fifo:
-            fifo.write('message-error "pykeepass failed to be imported."\n')
-            fifo.flush()
-    sys.exit(100)
-
-argument_parser = argparse.ArgumentParser(
-    description="Fill passwords using keepass.",
-    formatter_class=argparse.RawDescriptionHelpFormatter,
-    epilog=__doc__)
-argument_parser.add_argument('url', nargs='?', default=os.getenv('QUTE_URL'))
-argument_parser.add_argument('--path', '-p', required=True,
-                             help='Path to the keepass db.')
-argument_parser.add_argument('--keyfile-path', '-k', default=None,
-                             help='Path to a keepass keyfile')
-argument_parser.add_argument(
-    '--no-password', action='store_true',
-    help='Supply if no password is required to unlock this database. '
-    'Only allowed with --keyfile-path')
-argument_parser.add_argument(
-    '--dmenu-invocation', '-d', default='dmenu',
-    help='Invocation used to execute a dmenu-provider')
-argument_parser.add_argument(
-    '--dmenu-format', '-f', default='{title}: {username}',
-    help='Format string for keys to display in dmenu.'
-    ' Must generate a unique string.')
-argument_parser.add_argument(
-    '--no-insert-mode', '-n', dest='insert_mode', action='store_false',
-    help="Don't automatically enter insert mode")
-argument_parser.add_argument(
-    '--io-encoding', '-i', default='UTF-8',
-    help='Encoding used to communicate with subprocesses')
-group = argument_parser.add_mutually_exclusive_group()
-group.add_argument('--username-fill-only', '-e',
-                   action='store_true', help='Only insert username')
-group.add_argument('--password-fill-only', '-w',
-                   action='store_true', help='Only insert password')
-
-CMD_DELAY = 50
-
-
-class ExitCodes(enum.IntEnum):
-    """Stores various exit codes groups to use."""
-    SUCCESS = 0
-    FAILURE = 1
-    # 1 is automatically used if Python throws an exception
-    NO_CANDIDATES = 2
-    USER_QUIT = 3
-    DB_OPEN_FAIL = 4
-
-    INTERNAL_ERROR = 10
-
-
-def qute_command(command):
-    with open(os.environ['QUTE_FIFO'], 'w') as fifo:
-        fifo.write(command + '\n')
-        fifo.flush()
-
-
-def stderr(to_print):
-    """Extra functionality to echo out errors to qb ui."""
-    print(to_print, file=sys.stderr)
-    qute_command('message-error "{}"'.format(to_print))
-
-
-def dmenu(items, invocation, encoding):
-    """Runs dmenu with given arguments."""
-    command = shlex.split(invocation)
-    process = subprocess.run(command, input='\n'.join(items).encode(encoding),
-                             stdout=subprocess.PIPE)
-    return process.stdout.decode(encoding).strip()
-
-
-def get_password():
-    """Get a keepass db password from user."""
-    _app = QApplication(sys.argv)
-    text, ok = QInputDialog.getText(
-        None, "KeePass DB Password",
-        "Please enter your KeePass Master Password",
-        QLineEdit.Password)
-    if not ok:
-        stderr('Password Prompt Rejected.')
-        sys.exit(ExitCodes.USER_QUIT)
-    return text
-
-
-def find_candidates(args, host):
-    """Finds candidates that match host"""
-    file_path = os.path.expanduser(args.path)
-
-    # TODO find a way to keep the db open, so we don't open (and query
-    # password) it every time
-
-    pw = None
-    if not args.no_password:
-        pw = get_password()
-
-    kf = args.keyfile_path
-    if kf:
-        kf = os.path.expanduser(kf)
-
-    try:
-        kp = pykeepass.PyKeePass(file_path, password=pw, keyfile=kf)
-    except Exception as e:
-        stderr("There was an error opening the DB: {}".format(str(e)))
-
-    return kp.find_entries(url="{}{}{}".format(".*", host, ".*"), regex=True)
-
-
-def candidate_to_str(args, candidate):
-    """Turns candidate into a human readable string for dmenu"""
-    return args.dmenu_format.format(title=candidate.title,
-                                    url=candidate.url,
-                                    username=candidate.username,
-                                    path=candidate.path,
-                                    uuid=candidate.uuid)
-
-
-def candidate_to_secret(candidate):
-    """Turns candidate into a generic (user, password) tuple"""
-    return (candidate.username, candidate.password)
-
-
-def run(args):
-    """Runs qute-keepass"""
-    if not args.url:
-        argument_parser.print_help()
-        return ExitCodes.FAILURE
-
-    url_host = QUrl(args.url).host()
-
-    if not url_host:
-        stderr('{} was not parsed as a valid URL!'.format(args.url))
-        return ExitCodes.INTERNAL_ERROR
-
-    # Find candidates matching the host of the given URL
-    candidates = find_candidates(args, url_host)
-    if not candidates:
-        stderr('No candidates for URL {!r} found!'.format(args.url))
-        return ExitCodes.NO_CANDIDATES
-
-    # Create a map so we can get turn the resulting string from dmenu back into
-    # a candidate
-    candidates_strs = list(map(functools.partial(candidate_to_str, args),
-                               candidates))
-    candidates_map = dict(zip(candidates_strs, candidates))
-
-    if len(candidates) == 1:
-        selection = candidates.pop()
-    else:
-        selection = dmenu(candidates_strs,
-                          args.dmenu_invocation,
-                          args.io_encoding)
-
-        if selection not in candidates_map:
-            stderr("'{}' was not a valid entry!").format(selection)
-            return ExitCodes.USER_QUIT
-
-        selection = candidates_map[selection]
-
-    username, password = candidate_to_secret(selection)
-
-    insert_mode = ';; enter-mode insert' if args.insert_mode else ''
-    if args.username_fill_only:
-        qute_command('insert-text {}{}'.format(username, insert_mode))
-    elif args.password_fill_only:
-        qute_command('insert-text {}{}'.format(password, insert_mode))
-    else:
-        # Enter username and password using insert-key and fake-key <Tab>
-        # (which supports more passwords than fake-key only), then switch back
-        # into insert-mode, so the form can be directly submitted by hitting
-        # enter afterwards. It dosen't matter when we go into insert mode, but
-        # the other commands need to be be executed sequentially, so we add
-        # delays with later.
-        qute_command('insert-text {} ;;'
-                     'later {} fake-key <Tab> ;;'
-                     'later {} insert-text {}{}'
-                     .format(username, CMD_DELAY,
-                             CMD_DELAY * 2, password, insert_mode))
-
-    return ExitCodes.SUCCESS
-
-
-if __name__ == '__main__':
-    arguments = argument_parser.parse_args()
-    sys.exit(run(arguments))
--- a/misc/userscripts/qute-pass
+++ b/misc/userscripts/qute-pass
@@ -109,13 +109,6 @@ def dmenu(items, invocation, encoding):
    return process.stdout.decode(encoding).strip()


-def fake_key_raw(text):
-    for character in text:
-        # Escape all characters by default, space requires special handling
-        sequence = '" "' if character == ' ' else '\{}'.format(character)
-        qute_command('fake-key {}'.format(sequence))
-
-
 def main(arguments):
    if not arguments.url:
        argument_parser.print_help()
@@ -165,19 +158,15 @@ def main(arguments):
        return ExitCodes.COULD_NOT_MATCH_PASSWORD
    password = match.group(1)

+    insert_mode = ';; enter-mode insert' if arguments.insert_mode else ''
    if arguments.username_only:
-        fake_key_raw(username)
+        qute_command('fake-key {}{}'.format(username, insert_mode))
    elif arguments.password_only:
-        fake_key_raw(password)
+        qute_command('fake-key {}{}'.format(password, insert_mode))
    else:
        # Enter username and password using fake-key and <Tab> (which seems to work almost universally), then switch
        # back into insert-mode, so the form can be directly submitted by hitting enter afterwards
-        fake_key_raw(username)
-        qute_command('fake-key <Tab>')
-        fake_key_raw(password)
-
-    if arguments.insert_mode:
-        qute_command('enter-mode insert')
+        qute_command('fake-key {} ;; fake-key <Tab> ;; fake-key {}{}'.format(username, password, insert_mode))

    return ExitCodes.SUCCESS

--- a/qutebrowser/init.py
+++ b/qutebrowser/init.py
@@ -26,7 +26,7 @@ __copyright__ = "Copyright 2014-2018 Florian Bruhin (The Compiler)"
 __license__ = "GPL"
 __maintainer__ = __author__
 __email__ = "mail@qutebrowser.org"
-__version_info__ = (1, 3, 1)
+__version_info__ = (1, 2, 1)
 __version__ = '.'.join(str(e) for e in __version_info__)
 __description__ = "A keyboard-driven, vim-like browser based on PyQt5."

--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -724,13 +724,7 @@ class AbstractTab(QWidget):
        if getattr(evt, 'posted', False):
            raise utils.Unreachable("Can't re-use an event which was already "
                                    "posted!")
-
        recipient = self.event_target()
-        if recipient is None:
-            # https://github.com/qutebrowser/qutebrowser/issues/3888
-            log.webview.warning("Unable to find event target!")
-            return
-
        evt.posted = True
        QApplication.postEvent(recipient, evt)

--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -31,7 +31,7 @@ import attr
 from PyQt5.QtCore import pyqtSignal, QObject, QUrl

 from qutebrowser.utils import (log, standarddir, jinja, objreg, utils,
-                               javascript, urlmatch)
+                               javascript)
 from qutebrowser.commands import cmdutils
 from qutebrowser.browser import downloads

@@ -48,7 +48,6 @@ class GreasemonkeyScript:
    def __init__(self, properties, code):
        self._code = code
        self.includes = []
-        self.matches = []
        self.excludes = []
        self.requires = []
        self.description = None
@@ -64,10 +63,8 @@ class GreasemonkeyScript:
                self.namespace = value
            elif name == 'description':
                self.description = value
-            elif name == 'include':
+            elif name in ['include', 'match']:
                self.includes.append(value)
-            elif name == 'match':
-                self.matches.append(value)
            elif name in ['exclude', 'exclude_match']:
                self.excludes.append(value)
            elif name == 'run-at':
@@ -95,7 +92,7 @@ class GreasemonkeyScript:
            props = ""
        script = cls(re.findall(cls.PROPS_REGEX, props), source)
        script.script_meta = props
-        if not script.includes and not script.matches:
+        if not script.includes:
            script.includes = ['*']
        return script

@@ -120,7 +117,7 @@ class GreasemonkeyScript:
        return json.dumps({
            'name': self.name,
            'description': self.description,
-            'matches': self.matches,
+            'matches': self.includes,
            'includes': self.includes,
            'excludes': self.excludes,
            'run-at': self.run_at,
@@ -146,42 +143,6 @@ class MatchingScripts(object):
    idle = attr.ib(default=attr.Factory(list))


-class GreasemonkeyMatcher:
-
-    """Check whether scripts should be loaded for a given URL."""
-
-    # 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, url):
-        self._url = url
-        self._url_string = url.toString(QUrl.FullyEncoded)
-        self.is_greaseable = url.scheme() in self.GREASEABLE_SCHEMES
-
-    def _match_pattern(self, pattern):
-        # For include and exclude rules if they start and end with '/' they
-        # should be treated as a (ecma syntax) regular expression.
-        if pattern.startswith('/') and pattern.endswith('/'):
-            matches = re.search(pattern[1:-1], self._url_string, flags=re.I)
-            return matches is not None
-
-        # Otherwise they are glob expressions.
-        return fnmatch.fnmatch(self._url_string, pattern)
-
-    def matches(self, script):
-        """Check whether the URL matches filtering rules of the script."""
-        assert self.is_greaseable
-        matching_includes = any(self._match_pattern(pat)
-                                for pat in script.includes)
-        matching_match = any(urlmatch.UrlPattern(pat).matches(self._url)
-                             for pat in script.matches)
-        matching_excludes = any(self._match_pattern(pat)
-                                for pat in script.excludes)
-        return (matching_includes or matching_match) and not matching_excludes
-
-
 class GreasemonkeyManager(QObject):

    """Manager of userscripts and a Greasemonkey compatible environment.
@@ -193,6 +154,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)
@@ -344,17 +309,30 @@ class GreasemonkeyManager(QObject):
        returns a tuple of lists of scripts meant to run at (document-start,
        document-end, document-idle)
        """
-        matcher = GreasemonkeyMatcher(url)
-        if not matcher.is_greaseable:
+        if url.scheme() not in self.greaseable_schemes:
            return MatchingScripts(url, [], [], [])
+
+        string_url = url.toString(QUrl.FullyEncoded)
+
+        def _match(pattern):
+            # For include and exclude rules if they start and end with '/' they
+            # should be treated as a (ecma syntax) regular expression.
+            if pattern.startswith('/') and pattern.endswith('/'):
+                matches = re.search(pattern[1:-1], string_url, flags=re.I)
+                return matches is not None
+
+            # Otherwise they are glob expressions.
+            return fnmatch.fnmatch(string_url, pattern)
+
+        tester = (lambda script:
+                  any(_match(pat) for pat in script.includes) and
+                  not any(_match(pat) for pat in script.excludes))
+
        return MatchingScripts(
-            url=url,
-            start=[script for script in self._run_start
-                   if matcher.matches(script)],
-            end=[script for script in self._run_end
-                 if matcher.matches(script)],
-            idle=[script for script in self._run_idle
-                  if matcher.matches(script)]
+            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)]
        )

    def all_scripts(self):
--- a/qutebrowser/browser/mouse.py
+++ b/qutebrowser/browser/mouse.py
@@ -22,7 +22,7 @@
 from PyQt5.QtCore import QObject, QEvent, Qt, QTimer

 from qutebrowser.config import config
-from qutebrowser.utils import message, log, usertypes, qtutils
+from qutebrowser.utils import message, log, usertypes
 from qutebrowser.keyinput import modeman


@@ -54,14 +54,6 @@ class ChildEventFilter(QObject):
                obj, child))
            assert obj is self._widget
            child.installEventFilter(self._filter)
-
-            if qtutils.version_check('5.11', compiled=False, exact=True):
-                # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-68076
-                QTimer.singleShot(0, self._widget.setFocus)
-        elif event.type() == QEvent.ChildRemoved:
-            child = event.child()
-            log.mouse.debug("{}: removed child {}".format(obj, child))
-
        return False


--- a/qutebrowser/browser/webengine/spell.py
+++ b/qutebrowser/browser/webengine/spell.py
@@ -24,18 +24,16 @@ import os
 import re

 from PyQt5.QtCore import QLibraryInfo
-from qutebrowser.utils import log, message
-
-dict_version_re = re.compile(r".+-(?P<version>[0-9]+-[0-9]+?)\.bdic")
+from qutebrowser.utils import log


 def version(filename):
    """Extract the version number from the dictionary file name."""
-    match = dict_version_re.match(filename)
+    version_re = re.compile(r".+-(?P<version>[0-9]+-[0-9]+?)\.bdic")
+    match = version_re.fullmatch(filename)
    if match is None:
-        message.warning(
-            "Found a dictionary with a malformed name: {}".format(filename))
-        return None
+        raise ValueError('the given dictionary file name is malformed: {}'
+                         .format(filename))
    return tuple(int(n) for n in match.group('version').split('-'))


@@ -46,23 +44,15 @@ def dictionary_dir():


 def local_files(code):
-    """Return all installed dictionaries for the given code.
-
-    The returned dictionaries are sorted by version, therefore the latest will
-    be the first element. The list will be empty if no dictionaries are found.
-    """
+    """Return all installed dictionaries for the given code."""
    pathname = os.path.join(dictionary_dir(), '{}*.bdic'.format(code))
    matching_dicts = glob.glob(pathname)
-    versioned_dicts = []
-    for matching_dict in matching_dicts:
-        parsed_version = version(matching_dict)
-        if parsed_version is not None:
-            filename = os.path.basename(matching_dict)
-            log.config.debug('Found file for dict {}: {}'
-                             .format(code, filename))
-            versioned_dicts.append((parsed_version, filename))
-    return [filename for version, filename
-            in sorted(versioned_dicts, reverse=True)]
+    files = []
+    for matching_dict in sorted(matching_dicts, key=version, reverse=True):
+        filename = os.path.basename(matching_dict)
+        log.config.debug('Found file for dict {}: {}'.format(code, filename))
+        files.append(filename)
+    return files


 def local_filename(code):
--- a/qutebrowser/browser/webengine/webenginedownloads.py
+++ b/qutebrowser/browser/webengine/webenginedownloads.py
@@ -101,11 +101,7 @@ class DownloadItem(downloads.AbstractDownloadItem):

    def retry(self):
        state = self._qt_item.state()
-        if state != QWebEngineDownloadItem.DownloadInterrupted:
-            log.downloads.warning(
-                "Trying to retry download in state {}".format(
-                    debug.qenum_key(QWebEngineDownloadItem, state)))
-            return
+        assert state == QWebEngineDownloadItem.DownloadInterrupted, state

        try:
            self._qt_item.resume()
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -176,11 +176,24 @@ class ProfileSetter:
        """Initialize settings on the given profile."""
        self.set_http_headers()
        self.set_http_cache_size()
-        self._profile.settings().setAttribute(
-            QWebEngineSettings.FullScreenSupportEnabled, True)
+        self._init_attributes()
+
        if qtutils.version_check('5.8'):
+            self._profile.setSpellCheckEnabled(True)
            self.set_dictionary_language()

+    def _init_attributes(self):
+        """Initialize hard-coded attributes."""
+        values = {
+            'FullScreenSupportEnabled': True,
+            'FocusOnNavigationEnabled': True,
+        }
+        settings = self._profile.settings()
+        for name, value in values.items():
+            attr = getattr(QWebEngineSettings, name, None)
+            if attr is not None:
+                settings.setAttribute(attr, value)
+
    def set_http_headers(self):
        """Set the user agent and accept-language for the given profile.

@@ -229,7 +242,6 @@ class ProfileSetter:

        log.config.debug("Found dicts: {}".format(filenames))
        self._profile.setSpellCheckLanguages(filenames)
-        self._profile.setSpellCheckEnabled(bool(filenames))


 def _update_settings(option):
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -30,7 +30,7 @@ from PyQt5.QtCore import (pyqtSignal, pyqtSlot, Qt, QEvent, QPoint, QPointF,
                          QUrl, QTimer)
 from PyQt5.QtGui import QKeyEvent, QIcon
 from PyQt5.QtNetwork import QAuthenticator
-from PyQt5.QtWidgets import QApplication, QWidget
+from PyQt5.QtWidgets import QApplication
 from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineScript

 from qutebrowser.config import configdata, config
@@ -1026,9 +1026,8 @@ class WebEngineTab(browsertab.AbstractTab):
            log.config.debug(
                "Loading {} again because of config change".format(
                    self._reload_url.toDisplayString()))
-            QTimer.singleShot(100, functools.partial(self.openurl,
-                                                     self._reload_url,
-                                                     predict=False))
+            QTimer.singleShot(100, lambda url=self._reload_url:
+                              self.openurl(url, predict=False))
            self._reload_url = None

        if not qtutils.version_check('5.10', compiled=False):
@@ -1047,33 +1046,10 @@ class WebEngineTab(browsertab.AbstractTab):
    @pyqtSlot(usertypes.NavigationRequest)
    def _on_navigation_request(self, navigation):
        super()._on_navigation_request(navigation)
-
-        if qtutils.version_check('5.11.0', exact=True, compiled=False):
-            # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-68224
-            layout = self._widget.layout()
-            count = layout.count()
-            children = self._widget.findChildren(QWidget)
-            if not count and children:
-                log.webview.warning("Found children not in layout: {}, "
-                                    "focus proxy {} (QTBUG-68224)".format(
-                                        children, self._widget.focusProxy()))
-            if count > 1:
-                log.webview.debug("Found {} widgets! (QTBUG-68224)"
-                                  .format(count))
-                for i in range(count):
-                    item = layout.itemAt(i)
-                    if item is None:
-                        continue
-                    widget = item.widget()
-                    if widget is not self._widget.focusProxy():
-                        log.webview.debug("Removing widget {} (QTBUG-68224)"
-                                          .format(widget))
-                        layout.removeWidget(widget)
-
        if not navigation.accepted or not navigation.is_main_frame:
            return

-        settings_needing_reload = {
+        needs_reload = {
            'content.plugins',
            'content.javascript.enabled',
            'content.javascript.can_access_clipboard',
@@ -1082,20 +1058,11 @@ class WebEngineTab(browsertab.AbstractTab):
            'input.spatial_navigation',
            'input.spatial_navigation',
        }
-        assert settings_needing_reload.issubset(configdata.DATA)
+        assert needs_reload.issubset(configdata.DATA)

        changed = self.settings.update_for_url(navigation.url)
-        reload_needed = changed & settings_needing_reload
-
-        # On Qt < 5.11, we don't don't need a reload when type == link_clicked.
-        # On Qt 5.11.0, we always need a reload.
-        # TODO on Qt > 5.11.0, we hopefully never need a reload:
-        #      https://codereview.qt-project.org/#/c/229525/1
-        if not qtutils.version_check('5.11.0', exact=True, compiled=False):
-            if navigation.navigation_type != navigation.Type.link_clicked:
-                reload_needed = False
-
-        if reload_needed:
+        if (changed & needs_reload and navigation.navigation_type !=
+                navigation.Type.link_clicked):
            # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66656
            self._reload_url = navigation.url

@@ -1137,4 +1104,6 @@ class WebEngineTab(browsertab.AbstractTab):
        self.predicted_navigation.connect(self._on_predicted_navigation)

    def event_target(self):
-        return self._widget.focusProxy()
+        fp = self._widget.focusProxy()
+        assert fp is not None
+        return fp
--- a/qutebrowser/keyinput/basekeyparser.py
+++ b/qutebrowser/keyinput/basekeyparser.py
@@ -19,8 +19,6 @@

 """Base class for vim-like key sequence parser."""

-import string
-
 from PyQt5.QtCore import pyqtSignal, QObject
 from PyQt5.QtGui import QKeySequence

@@ -138,7 +136,7 @@ class BaseKeyParser(QObject):
    def _match_count(self, sequence, dry_run):
        """Try to match a key as count."""
        txt = str(sequence[-1])  # To account for sequences changed above.
-        if (txt in string.digits and self._supports_count and
+        if (txt.isdigit() and self._supports_count and
                not (not self._count and txt == '0')):
            self._debug_log("Trying match as count")
            assert len(txt) == 1, txt
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -19,8 +19,6 @@

 """The commandline in the statusbar."""

-import functools
-
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QSize
 from PyQt5.QtWidgets import QSizePolicy

@@ -71,26 +69,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
        self.textChanged.connect(self.updateGeometry)
        self.textChanged.connect(self._incremental_search)

-        self._command_dispatcher = objreg.get(
-            'command-dispatcher', scope='window', window=self._win_id)
-
-    def _handle_search(self):
-        """Check if the currently entered text is a search, and if so, run it.
-
-        Return:
-            True if a search was executed, False otherwise.
-        """
-        search_prefixes = {
-            '/': self._command_dispatcher.search,
-            '?': functools.partial(
-                self._command_dispatcher.search, reverse=True)
-        }
-        if self.prefix() in search_prefixes:
-            search_fn = search_prefixes[self.prefix()]
-            search_fn(self.text()[1:])
-            return True
-        return False
-
    def prefix(self):
        """Get the currently entered command prefix."""
        text = self.text()
@@ -184,17 +162,17 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
        Args:
            rapid: Run the command without closing or clearing the command bar.
        """
+        prefixes = {
+            ':': '',
+            '/': 'search -- ',
+            '?': 'search -r -- ',
+        }
        text = self.text()
        self.history.append(text)
-
-        was_search = self._handle_search()
-
        if not rapid:
            modeman.leave(self._win_id, usertypes.KeyMode.command,
                          'cmd accept')
-
-        if not was_search:
-            self.got_cmd[str].emit(text[1:])
+        self.got_cmd[str].emit(prefixes[text[0]] + text[1:])

    @cmdutils.register(instance='status-command', scope='window')
    def edit_command(self, run=False):
@@ -275,9 +253,15 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
        width = self.fontMetrics().width(text)
        return QSize(width, height)

-    @pyqtSlot()
-    def _incremental_search(self):
+    @pyqtSlot(str)
+    def _incremental_search(self, text):
        if not config.val.search.incremental:
            return

-        self._handle_search()
+        search_prefixes = {
+            '/': 'search -- ',
+            '?': 'search -r -- ',
+        }
+
+        if self.prefix() in ['/', '?']:
+            self.got_cmd[str].emit(search_prefixes[text[0]] + text[1:])
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -489,9 +489,6 @@ class TabbedBrowser(QWidget):
                                               self.widget.count())
        else:
            self.widget.setCurrentWidget(tab)
-            # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-68076
-            # Still seems to be needed with Qt 5.11.1
-            tab.setFocus()

        tab.show()
        self.new_tab.emit(tab, idx)
--- a/qutebrowser/misc/autoupdate.py
+++ b/qutebrowser/misc/autoupdate.py
@@ -45,7 +45,7 @@ class PyPIVersionClient(QObject):
               arg: The error message, as string.
    """

-    API_URL = 'https://pypi.org/pypi/{}/json'
+    API_URL = 'https://pypi.python.org/pypi/{}/json'
    success = pyqtSignal(str)
    error = pyqtSignal(str)

--- a/qutebrowser/misc/httpclient.py
+++ b/qutebrowser/misc/httpclient.py
@@ -28,21 +28,6 @@ from PyQt5.QtNetwork import (QNetworkAccessManager, QNetworkRequest,
                             QNetworkReply)


-class HTTPRequest(QNetworkRequest):
-    """A QNetworkRquest that follows (secure) redirects by default."""
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        try:
-            self.setAttribute(QNetworkRequest.RedirectPolicyAttribute,
-                              QNetworkRequest.NoLessSafeRedirectPolicy)
-        except AttributeError:
-            # RedirectPolicyAttribute was introduced in 5.9 to replace
-            # FollowRedirectsAttribute.
-            self.setAttribute(QNetworkRequest.FollowRedirectsAttribute,
-                              True)
-
-
 class HTTPClient(QObject):

    """An HTTP client based on QNetworkAccessManager.
@@ -78,7 +63,7 @@ class HTTPClient(QObject):
        if data is None:
            data = {}
        encoded_data = urllib.parse.urlencode(data).encode('utf-8')
-        request = HTTPRequest(url)
+        request = QNetworkRequest(url)
        request.setHeader(QNetworkRequest.ContentTypeHeader,
                          'application/x-www-form-urlencoded;charset=utf-8')
        reply = self._nam.post(request, encoded_data)
@@ -92,7 +77,7 @@ class HTTPClient(QObject):
        Args:
            url: The URL to access, as QUrl.
        """
-        request = HTTPRequest(url)
+        request = QNetworkRequest(url)
        reply = self._nam.get(request)
        self._handle_reply(reply)

--- a/tests/end2end/data/search.html
+++ b/tests/end2end/data/search.html
@@ -16,8 +16,6 @@
            BAZ<br/>
            space travel<br/>
            /slash<br/>
-            -r reversed<br/>
-            ;; semicolons<br/>
            <a class="toselect" href="hello.txt">follow me!</a><br/>
        </p>
    </body>
--- a/tests/end2end/features/search.feature
+++ b/tests/end2end/features/search.feature
@@ -40,26 +40,11 @@ Feature: Searching on a page
        Then "space " should be found

    Scenario: Searching with / and slash in search term (issue 507)
-        When I run :set-cmd-text //slash
+        When I run :set-cmd-text -s //slash
        And I run :command-accept
        And I wait for "search found /slash" in the log
        Then "/slash" should be found

-    Scenario: Searching with arguments at start of search term
-        When I run :set-cmd-text /-r reversed
-        And I run :command-accept
-        And I wait for "search found -r reversed" in the log
-        Then "-r reversed" should be found
-
-    Scenario: Searching with semicolons in search term
-        When I run :set-cmd-text /;
-        And I run :fake-key -g ;
-        And I run :fake-key -g <space>
-        And I run :fake-key -g semi
-        And I run :command-accept
-        And I wait for "search found ;; semi" in the log
-        Then ";; semi" should be found
-
    # This doesn't work because this is QtWebKit behavior.
    @xfail_norun
    Scenario: Searching text with umlauts
--- a/tests/unit/browser/webengine/test_spell.py
+++ b/tests/unit/browser/webengine/test_spell.py
@@ -17,69 +17,31 @@
 # 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.webengine.spell module."""
-
-import logging
-import os
-
-from PyQt5.QtCore import QLibraryInfo
+import pytest
 from qutebrowser.browser.webengine import spell
-from qutebrowser.utils import usertypes


-def test_version(message_mock, caplog):
-    """Tests parsing dictionary version from its file name."""
+def test_version():
    assert spell.version('en-US-8-0.bdic') == (8, 0)
    assert spell.version('pl-PL-3-0.bdic') == (3, 0)
-    with caplog.at_level(logging.WARNING):
-        assert spell.version('malformed_filename') is None
-    msg = message_mock.getmsg(usertypes.MessageLevel.warning)
-    expected = ("Found a dictionary with a malformed name: malformed_filename")
-    assert msg.text == expected
+    with pytest.raises(ValueError):
+        spell.version('malformed_filename')


-def test_dictionary_dir(monkeypatch):
-    monkeypatch.setattr(QLibraryInfo, 'location', lambda _: 'datapath')
-    assert spell.dictionary_dir() == os.path.join('datapath',
-                                                  'qtwebengine_dictionaries')
-
-
-def test_local_filename_dictionary_does_not_exist(monkeypatch):
-    """Tests retrieving local filename when the dir doesn't exits."""
+def test_local_filename_dictionary_does_not_exist(tmpdir, monkeypatch):
    monkeypatch.setattr(
        spell, 'dictionary_dir', lambda: '/some-non-existing-dir')
    assert not spell.local_filename('en-US')


 def test_local_filename_dictionary_not_installed(tmpdir, monkeypatch):
-    """Tests retrieving local filename when the dict not installed."""
    monkeypatch.setattr(spell, 'dictionary_dir', lambda: str(tmpdir))
    assert not spell.local_filename('en-US')


-def test_local_filename_not_installed_malformed(tmpdir, monkeypatch, caplog):
-    """Tests retrieving local filename when the only file is malformed."""
-    monkeypatch.setattr(spell, 'dictionary_dir', lambda: str(tmpdir))
-    (tmpdir / 'en-US.bdic').ensure()
-    with caplog.at_level(logging.WARNING):
-        assert not spell.local_filename('en-US')
-
-
 def test_local_filename_dictionary_installed(tmpdir, monkeypatch):
-    """Tests retrieving local filename when the dict installed."""
    monkeypatch.setattr(spell, 'dictionary_dir', lambda: str(tmpdir))
    for lang_file in ['en-US-11-0.bdic', 'en-US-7-1.bdic', 'pl-PL-3-0.bdic']:
        (tmpdir / lang_file).ensure()
    assert spell.local_filename('en-US') == 'en-US-11-0'
    assert spell.local_filename('pl-PL') == 'pl-PL-3-0'
-
-
-def test_local_filename_installed_malformed(tmpdir, monkeypatch, caplog):
-    """Tests retrieving local filename when the dict installed.
-
-    In this usecase, another existing file is malformed."""
-    monkeypatch.setattr(spell, 'dictionary_dir', lambda: str(tmpdir))
-    for lang_file in ['en-US-11-0.bdic', 'en-US-7-1.bdic', 'en-US.bdic']:
-        (tmpdir / lang_file).ensure()
-    with caplog.at_level(logging.WARNING):
-        assert spell.local_filename('en-US') == 'en-US-11-0'
--- a/tests/unit/browser/webengine/test_webenginesettings.py
+++ b/tests/unit/browser/webengine/test_webenginesettings.py
@@ -73,14 +73,3 @@ def test_existing_dict(config_stub, monkeypatch):
                    webenginesettings.private_profile]:
        assert profile.isSpellCheckEnabled()
        assert profile.spellCheckLanguages() == ['en-US-8-0']
-
-
-@pytest.mark.skipif(
-    not qtutils.version_check('5.8'), reason="Needs Qt 5.8 or newer")
-def test_spell_check_disabled(config_stub, monkeypatch):
-    monkeypatch.setattr(objects, 'backend', usertypes.Backend.QtWebEngine)
-    config_stub.val.spellcheck.languages = []
-    webenginesettings._update_settings('spellcheck.languages')
-    for profile in [webenginesettings.default_profile,
-                    webenginesettings.private_profile]:
-        assert not profile.isSpellCheckEnabled()
--- a/tests/unit/javascript/test_greasemonkey.py
+++ b/tests/unit/javascript/test_greasemonkey.py
@@ -32,7 +32,7 @@ test_gm_script = r"""
 // @name qutebrowser test userscript
 // @namespace invalid.org
 // @include http://localhost:*/data/title.html
-// @match http://*.trolol.com/*
+// @match http://trolol*
 // @exclude https://badhost.xxx/*
 // @run-at document-start
 // ==/UserScript==
@@ -60,7 +60,7 @@ def test_all():

@pytest.mark.parametrize("url, expected_matches", [
    # included
-    ('http://trolol.com/', 1),
+    ('http://trololololololo.com/', 1),
    # neither included nor excluded
    ('http://aaaaaaaaaa.com/', 0),
    # excluded
--- a/tests/unit/keyinput/test_basekeyparser.py
+++ b/tests/unit/keyinput/test_basekeyparser.py
@@ -320,10 +320,6 @@ class TestCount:
        keyparser.execute.assert_called_once_with('message-info ccc', 23)
        assert not keyparser._sequence

-    def test_superscript(self, handle_text, keyparser):
-        # https://github.com/qutebrowser/qutebrowser/issues/3743
-        handle_text(Qt.Key_twosuperior, Qt.Key_B, Qt.Key_A)
-
    def test_count_keystring_update(self, qtbot, handle_text, keyparser):
        """Make sure the keystring is updated correctly when entering count."""
        with qtbot.waitSignals([keyparser.keystring_updated,
--- a/tests/unit/misc/test_autoupdate.py
+++ b/tests/unit/misc/test_autoupdate.py
@@ -67,7 +67,7 @@ def test_get_version_success(qtbot):
        with qtbot.waitSignal(client.success):
            client.get_version('test')

-    assert http_stub.url == QUrl(client.API_URL.format('test'))
+    assert http_stub.url == QUrl('https://pypi.python.org/pypi/test/json')


 def test_get_version_error(qtbot):