This commit is contained in:
Florian Bruhin 2017-09-18 21:24:09 +02:00
parent f10d334c90
commit 5c0ebc1f94
6 changed files with 11 additions and 10 deletions

View File

@ -52,9 +52,9 @@ from qutebrowser.browser.webkit.network import networkmanager
from qutebrowser.keyinput import macros from qutebrowser.keyinput import macros
from qutebrowser.mainwindow import mainwindow, prompt from qutebrowser.mainwindow import mainwindow, prompt
from qutebrowser.misc import (readline, ipc, savemanager, sessions, from qutebrowser.misc import (readline, ipc, savemanager, sessions,
crashsignal, earlyinit, objects, sql, cmdhistory) crashsignal, earlyinit, sql, cmdhistory)
from qutebrowser.utils import (log, version, message, utils, qtutils, urlutils, from qutebrowser.utils import (log, version, message, utils, urlutils, objreg,
objreg, usertypes, standarddir, error) usertypes, standarddir, error)
# pylint: disable=unused-import # pylint: disable=unused-import
# We import those to run the cmdutils.register decorators. # We import those to run the cmdutils.register decorators.
from qutebrowser.mainwindow.statusbar import command from qutebrowser.mainwindow.statusbar import command

View File

@ -28,7 +28,6 @@ import json
import os import os
import time import time
import urllib.parse import urllib.parse
import datetime
import textwrap import textwrap
import pkg_resources import pkg_resources
@ -37,7 +36,7 @@ from PyQt5.QtCore import QUrlQuery, QUrl
import qutebrowser import qutebrowser
from qutebrowser.config import config, configdata, configexc, configdiff from qutebrowser.config import config, configdata, configexc, configdiff
from qutebrowser.utils import (version, utils, jinja, log, message, docutils, from qutebrowser.utils import (version, utils, jinja, log, message, docutils,
objreg, usertypes, qtutils) objreg)
from qutebrowser.misc import objects from qutebrowser.misc import objects

View File

@ -404,8 +404,8 @@ class NetworkManager(QNetworkAccessManager):
current_url = tab.url() current_url = tab.url()
except (KeyError, RuntimeError): except (KeyError, RuntimeError):
# https://github.com/qutebrowser/qutebrowser/issues/889 # https://github.com/qutebrowser/qutebrowser/issues/889
# Catching RuntimeError because we could be in the middle of the # Catching RuntimeError because we could be in the middle of
# webpage shutdown here. # the webpage shutdown here.
current_url = QUrl() current_url = QUrl()
self.set_referer(req, current_url) self.set_referer(req, current_url)

View File

@ -28,7 +28,8 @@ from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QUrl
from PyQt5.QtWidgets import QMessageBox from PyQt5.QtWidgets import QMessageBox
from qutebrowser.config import configdata, configexc, configtypes, configfiles from qutebrowser.config import configdata, configexc, configtypes, configfiles
from qutebrowser.utils import utils, objreg, message, log, usertypes, jinja, qtutils from qutebrowser.utils import (utils, objreg, message, log, usertypes, jinja,
qtutils)
from qutebrowser.misc import objects, msgbox, earlyinit from qutebrowser.misc import objects, msgbox, earlyinit
from qutebrowser.commands import cmdexc, cmdutils, runners from qutebrowser.commands import cmdexc, cmdutils, runners
from qutebrowser.completion.models import configmodel from qutebrowser.completion.models import configmodel
@ -697,7 +698,7 @@ def get_backend(args):
except ImportError: except ImportError:
webkit_available = False webkit_available = False
else: else:
webkit_available = qtutils.is_new_webkit() webkit_available = qtutils.is_new_qtwebkit()
if args.backend is not None: if args.backend is not None:
backends = { backends = {

View File

@ -192,6 +192,7 @@ def check_qt_version():
def check_ssl_support(): def check_ssl_support():
"""Check if SSL support is available.""" """Check if SSL support is available."""
# pylint: disable=unused-variable
try: try:
from PyQt5.QtNetwork import QSslSocket from PyQt5.QtNetwork import QSslSocket
except ImportError: except ImportError:

View File

@ -44,7 +44,7 @@ except ImportError: # pragma: no cover
QWebEngineProfile = None QWebEngineProfile = None
import qutebrowser import qutebrowser
from qutebrowser.utils import log, utils, standarddir, usertypes, qtutils from qutebrowser.utils import log, utils, standarddir, usertypes
from qutebrowser.misc import objects, earlyinit, sql from qutebrowser.misc import objects, earlyinit, sql
from qutebrowser.browser import pdfjs from qutebrowser.browser import pdfjs