pylint: Handle consider-using-with

8 files changed, 15 insertions, 12 deletions

diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index 4f7897c9d..32bfd2693 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -1352,6 +1352,7 @@ class TempDownloadManager:
             The tempfile.TemporaryDirectory that is used.
         """
         if self._tmpdir is None:
+            # pylint: disable=consider-using-with
             self._tmpdir = tempfile.TemporaryDirectory(
                 prefix='qutebrowser-downloads-')
         return self._tmpdir
@@ -1373,6 +1374,7 @@ class TempDownloadManager:
         suggested_name = utils.sanitize_filename(suggested_name)
         # Make sure that the filename is not too long
         suggested_name = utils.elide_filename(suggested_name, 50)
+        # pylint: disable=consider-using-with
         fobj = tempfile.NamedTemporaryFile(dir=tmpdir.name, delete=False,
                                            suffix='_' + suggested_name)
         self.files.append(fobj)
diff --git a/qutebrowser/browser/qtnetworkdownloads.py b/qutebrowser/browser/qtnetworkdownloads.py
index f048d293d..82ed94380 100644
--- a/qutebrowser/browser/qtnetworkdownloads.py
+++ b/qutebrowser/browser/qtnetworkdownloads.py
@@ -110,6 +110,7 @@ class DownloadItem(downloads.AbstractDownloadItem):
         """Create a file object using the internal filename."""
         assert self._filename is not None
         try:
+            # pylint: disable=consider-using-with
             fileobj = open(self._filename, 'wb')
         except OSError as e:
             self._die(e.strerror)
diff --git a/qutebrowser/browser/shared.py b/qutebrowser/browser/shared.py
index 8d3ebe730..2fd0d0c65 100644
--- a/qutebrowser/browser/shared.py
+++ b/qutebrowser/browser/shared.py
@@ -418,12 +418,11 @@ def choose_file(qb_mode: FileSelectionMode) -> List[str]:
     }[qb_mode]
     use_tmp_file = any('{}' in arg for arg in command[1:])
     if use_tmp_file:
-        handle = tempfile.NamedTemporaryFile(
+        with tempfile.NamedTemporaryFile(
             prefix='qutebrowser-fileselect-',
             delete=False,
-        )
-        handle.close()
-        tmpfilename = handle.name
+        ) as handle:
+            tmpfilename = handle.name
         with utils.cleanup_file(tmpfilename):
             command = (
                 command[:1] +
diff --git a/qutebrowser/commands/userscripts.py b/qutebrowser/commands/userscripts.py
index 70c639207..8282aa7c7 100644
--- a/qutebrowser/commands/userscripts.py
+++ b/qutebrowser/commands/userscripts.py
@@ -342,9 +342,8 @@ class _WindowsUserscriptRunner(_BaseUserscriptRunner):
         self._kwargs = kwargs
 
         try:
-            handle = tempfile.NamedTemporaryFile(delete=False)
-            handle.close()
-            self._filepath = handle.name
+            with tempfile.NamedTemporaryFile(delete=False) as handle:
+                self._filepath = handle.name
         except OSError as e:
             message.error("Error while creating tempfile: {}".format(e))
             return
diff --git a/qutebrowser/components/hostblock.py b/qutebrowser/components/hostblock.py
index 1860b734c..191719f10 100644
--- a/qutebrowser/components/hostblock.py
+++ b/qutebrowser/components/hostblock.py
@@ -64,9 +64,10 @@ def get_fileobj(byte_io: IO[bytes]) -> IO[bytes]:
     byte_io.seek(0)  # rewind downloaded file
     if zipfile.is_zipfile(byte_io):
         byte_io.seek(0)  # rewind what zipfile.is_zipfile did
-        zf = zipfile.ZipFile(byte_io)
-        filename = _guess_zip_filename(zf)
-        byte_io = zf.open(filename, mode="r")
+        with zipfile.ZipFile(byte_io) as zf:
+            filename = _guess_zip_filename(zf)
+            # pylint: disable=consider-using-with
+            byte_io = zf.open(filename, mode="r")
     else:
         byte_io.seek(0)  # rewind what zipfile.is_zipfile did
     return byte_io
diff --git a/qutebrowser/components/utils/blockutils.py b/qutebrowser/components/utils/blockutils.py
index bd27baece..98681a488 100644
--- a/qutebrowser/components/utils/blockutils.py
+++ b/qutebrowser/components/utils/blockutils.py
@@ -125,7 +125,7 @@ class BlocklistDownloads(QObject):
             filename: path to a local file to import.
         """
         try:
-            fileobj = open(filename, "rb")
+            fileobj = open(filename, "rb")  # pylint: disable=consider-using-with
         except OSError as e:
             message.error(
                 "blockutils: Error while reading {}: {}".format(filename, e.strerror)
diff --git a/qutebrowser/misc/crashsignal.py b/qutebrowser/misc/crashsignal.py
index 45c52f54c..4ba1aca44 100644
--- a/qutebrowser/misc/crashsignal.py
+++ b/qutebrowser/misc/crashsignal.py
@@ -150,6 +150,7 @@ class CrashHandler(QObject):
         """Start a new logfile and redirect faulthandler to it."""
         logname = os.path.join(standarddir.data(), 'crash.log')
         try:
+            # pylint: disable=consider-using-with
             self._crash_log_file = open(logname, 'w', encoding='ascii')
         except OSError:
             log.init.exception("Error while opening crash log file!")
diff --git a/qutebrowser/misc/quitter.py b/qutebrowser/misc/quitter.py
index a51891685..905429989 100644
--- a/qutebrowser/misc/quitter.py
+++ b/qutebrowser/misc/quitter.py
@@ -194,7 +194,7 @@ class Quitter(QObject):
         # Open a new process and immediately shutdown the existing one
         try:
             args = self._get_restart_args(pages, session, override_args)
-            subprocess.Popen(args)
+            subprocess.Popen(args)  # pylint: disable=consider-using-with
         except OSError:
             log.destroy.exception("Failed to restart")
             return False