pylint: Handle consider-using-with

4 files changed, 21 insertions, 21 deletions

diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py
index 4961cbdc8..241d27f1d 100755
--- a/scripts/dev/build_release.py
+++ b/scripts/dev/build_release.py
@@ -489,15 +489,15 @@ def build_sdist():
     dist_file = os.path.join('dist', dist_files[0])
     subprocess.run(['gpg', '--detach-sign', '-a', dist_file], check=True)
 
-    tar = tarfile.open(dist_file)
     by_ext = collections.defaultdict(list)
 
-    for tarinfo in tar.getmembers():
-        if not tarinfo.isfile():
-            continue
-        name = os.sep.join(tarinfo.name.split(os.sep)[1:])
-        _base, ext = os.path.splitext(name)
-        by_ext[ext].append(name)
+    with tarfile.open(dist_file) as tar:
+        for tarinfo in tar.getmembers():
+            if not tarinfo.isfile():
+                continue
+            name = os.sep.join(tarinfo.name.split(os.sep)[1:])
+            _base, ext = os.path.splitext(name)
+            by_ext[ext].append(name)
 
     assert '.pyc' not in by_ext
 
diff --git a/scripts/dev/update_3rdparty.py b/scripts/dev/update_3rdparty.py
index 88f56b7f3..60b72d110 100755
--- a/scripts/dev/update_3rdparty.py
+++ b/scripts/dev/update_3rdparty.py
@@ -160,11 +160,11 @@ def test_dicts():
         print('Testing dictionary {}... '.format(lang.code), end='')
         lang_url = urllib.parse.urljoin(dictcli.API_URL, lang.remote_filename)
         request = urllib.request.Request(lang_url, method='HEAD')
-        response = urllib.request.urlopen(request)
-        if response.status == 200:
-            print('OK')
-        else:
-            print('ERROR: {}'.format(response.status))
+        with urllib.request.urlopen(request) as response:
+            if response.status == 200:
+                print('OK')
+            else:
+                print('ERROR: {}'.format(response.status))
 
 
 def run(nsis=False, ace=False, pdfjs=True, fancy_dmg=False, pdfjs_version=None,
diff --git a/scripts/dictcli.py b/scripts/dictcli.py
index 8cb93fb8a..a937fd31d 100755
--- a/scripts/dictcli.py
+++ b/scripts/dictcli.py
@@ -142,11 +142,11 @@ def parse_entry(entry):
 def language_list_from_api():
     """Return a JSON with a list of available languages from Google API."""
     listurl = API_URL + '?format=JSON'
-    response = urllib.request.urlopen(listurl)
-    # A special 5-byte prefix must be stripped from the response content
-    # See: https://github.com/google/gitiles/issues/22
-    #      https://github.com/google/gitiles/issues/82
-    json_content = response.read()[5:]
+    with urllib.request.urlopen(listurl) as response:
+        # A special 5-byte prefix must be stripped from the response content
+        # See: https://github.com/google/gitiles/issues/22
+        #      https://github.com/google/gitiles/issues/82
+        json_content = response.read()[5:]
     entries = json.loads(json_content.decode('utf-8'))['entries']
     parsed_entries = [parse_entry(entry) for entry in entries]
     return [entry for entry in parsed_entries if entry is not None]
@@ -176,8 +176,8 @@ def available_languages():
 
 def download_dictionary(url, dest):
     """Download a decoded dictionary file."""
-    response = urllib.request.urlopen(url)
-    decoded = base64.decodebytes(response.read())
+    with urllib.request.urlopen(url) as response:
+        decoded = base64.decodebytes(response.read())
     with open(dest, 'bw') as dict_file:
         dict_file.write(decoded)
 
diff --git a/scripts/hostblock_blame.py b/scripts/hostblock_blame.py
index 38acaa58d..b18c62925 100644
--- a/scripts/hostblock_blame.py
+++ b/scripts/hostblock_blame.py
@@ -41,8 +41,8 @@ def main():
 
     for url in configdata.DATA['content.blocking.hosts.lists'].default:
         print("checking {}...".format(url))
-        raw_file = urllib.request.urlopen(url)
-        byte_io = io.BytesIO(raw_file.read())
+        with urllib.request.urlopen(url) as raw_file:
+            byte_io = io.BytesIO(raw_file.read())
         f = hostblock.get_fileobj(byte_io)
         for line in f:
             line = line.decode('utf-8')