From 24148c649eb41fb98b6e3372390bbbb863d14414 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 6 Sep 2018 22:06:56 +0200 Subject: [PATCH] Fix lint and tests --- qutebrowser/browser/downloads.py | 7 ++----- qutebrowser/browser/qutescheme.py | 1 - qutebrowser/browser/webengine/webenginedownloads.py | 1 - qutebrowser/browser/webkit/network/webkitqutescheme.py | 4 +--- tests/unit/browser/test_pdfjs.py | 2 -- tests/unit/browser/webkit/test_downloads.py | 4 ---- 6 files changed, 3 insertions(+), 16 deletions(-) diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py index a2917e4f0..aa1140784 100644 --- a/qutebrowser/browser/downloads.py +++ b/qutebrowser/browser/downloads.py @@ -241,7 +241,6 @@ class FileDownloadTarget(_DownloadTarget): """ def __init__(self, filename, force_overwrite=False): - # pylint: disable=super-init-not-called self.filename = filename self.force_overwrite = force_overwrite @@ -261,7 +260,6 @@ class FileObjDownloadTarget(_DownloadTarget): """ def __init__(self, fileobj): - # pylint: disable=super-init-not-called self.fileobj = fileobj def suggested_filename(self): @@ -288,7 +286,6 @@ class OpenFileDownloadTarget(_DownloadTarget): """ def __init__(self, cmdline=None): - # pylint: disable=super-init-not-called self.cmdline = cmdline def suggested_filename(self): @@ -776,8 +773,8 @@ class AbstractDownloadItem(QObject): return if isinstance(target, OpenFileDownloadTarget): - self.finished.connect( - functools.partial(self._open_if_successful, target.cmdline)) + self.finished.connect(functools.partial( + self._open_if_successful, target.cmdline)) elif isinstance(target, PDFJSDownloadTarget): self.finished.connect(self._pdfjs_if_successful) else: diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py index 135089d11..41d2cabaf 100644 --- a/qutebrowser/browser/qutescheme.py +++ b/qutebrowser/browser/qutescheme.py @@ -48,7 +48,6 @@ from qutebrowser.browser import pdfjs from qutebrowser.config import config, configdata, configexc, configdiff from qutebrowser.utils import (version, utils, jinja, log, message, docutils, objreg, urlutils) -from qutebrowser.misc import objects from qutebrowser.qt import sip diff --git a/qutebrowser/browser/webengine/webenginedownloads.py b/qutebrowser/browser/webengine/webenginedownloads.py index 4b48e7be5..a9d44427d 100644 --- a/qutebrowser/browser/webengine/webenginedownloads.py +++ b/qutebrowser/browser/webengine/webenginedownloads.py @@ -225,7 +225,6 @@ class DownloadManager(downloads.AbstractDownloadManager): download.set_target(downloads.PDFJSDownloadTarget()) return - filename = downloads.immediate_download_path() if filename is not None: # User doesn't want to be asked, so just use the download_dir diff --git a/qutebrowser/browser/webkit/network/webkitqutescheme.py b/qutebrowser/browser/webkit/network/webkitqutescheme.py index 18473addf..319f96df2 100644 --- a/qutebrowser/browser/webkit/network/webkitqutescheme.py +++ b/qutebrowser/browser/webkit/network/webkitqutescheme.py @@ -19,14 +19,12 @@ """QtWebKit specific qute://* handlers and glue code.""" -import mimetypes - from PyQt5.QtCore import QUrl from PyQt5.QtNetwork import QNetworkReply, QNetworkAccessManager from qutebrowser.browser import qutescheme from qutebrowser.browser.webkit.network import networkreply -from qutebrowser.utils import log, usertypes, qtutils +from qutebrowser.utils import log, qtutils def handler(request, operation, current_url): diff --git a/tests/unit/browser/test_pdfjs.py b/tests/unit/browser/test_pdfjs.py index 594e69df6..c30d9fb08 100644 --- a/tests/unit/browser/test_pdfjs.py +++ b/tests/unit/browser/test_pdfjs.py @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with qutebrowser. If not, see . -import textwrap - import pytest from PyQt5.QtCore import QUrl diff --git a/tests/unit/browser/webkit/test_downloads.py b/tests/unit/browser/webkit/test_downloads.py index 571e21704..b42caed00 100644 --- a/tests/unit/browser/webkit/test_downloads.py +++ b/tests/unit/browser/webkit/test_downloads.py @@ -68,10 +68,6 @@ def test_page_titles(url, title, out): class TestDownloadTarget: - def test_base(self): - with pytest.raises(NotImplementedError): - downloads._DownloadTarget() - def test_filename(self): target = downloads.FileDownloadTarget("/foo/bar") assert target.filename == "/foo/bar"