fix: revert style changes to fetch-content

It turns out there are still some tasks in Gecko that need to run
`fetch-content` against Python 3.8. Until we can get those tasks onto a
newer version, let's keep fetch-content 3.8 compatible for now.

Author: ahal

.pre-commit-config.yaml

@@ -41,8 +41,11 @@ repos:
     hooks:
       - id: conventional-pre-commit
         stages: [commit-msg]
+# TODO remove 'fetch-content' once Gecko no longer needs to use it with Python 3.8
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1990567#c7
 exclude: |
   (?x)^(
+    src/taskgraph/run-task/fetch-content |
     src/taskgraph/run-task/robustcheckout.py |
     taskcluster/scripts/external_tools
   )

src/taskgraph/run-task/fetch-content

@@ -413,12 +413,9 @@ def extract_archive(path, dest_dir):
         raise ValueError(f"unknown archive format: {path}")
 
     if args:
-        with (
-            ifh,
-            subprocess.Popen(
-                args, cwd=str(dest_dir), bufsize=0, stdin=subprocess.PIPE
-            ) as p,
-        ):
+        with ifh, subprocess.Popen(
+            args, cwd=str(dest_dir), bufsize=0, stdin=subprocess.PIPE
+        ) as p:
             while True:
                 if not pipe_stdin:
                     break
@@ -530,13 +527,10 @@ def repack_archive(
     with rename_after_close(dest, "wb") as fh:
         ctx = ZstdCompressor()
         if orig_typ in ("exec", None):
-            with (
-                ctx.stream_writer(fh) as compressor,
-                tarfile.open(
-                    fileobj=compressor,
-                    mode="w:",
-                ) as tar,
-            ):
+            with ctx.stream_writer(fh) as compressor, tarfile.open(
+                fileobj=compressor,
+                mode="w:",
+            ) as tar:
                 tarinfo = tarfile.TarInfo()
                 tarinfo.name = filter(orig.name) if filter else orig.name
                 st = orig.stat()
@@ -549,10 +543,9 @@ def repack_archive(
             assert typ == "tar"
             zip = zipfile.ZipFile(ifh)
             # Convert the zip stream to a tar on the fly.
-            with (
-                ctx.stream_writer(fh) as compressor,
-                tarfile.open(fileobj=compressor, mode="w:") as tar,
-            ):
+            with ctx.stream_writer(fh) as compressor, tarfile.open(
+                fileobj=compressor, mode="w:"
+            ) as tar:
                 for zipinfo in zip.infolist():
                     if zipinfo.is_dir():
                         continue
@@ -594,14 +587,11 @@ def repack_archive(
                 # To apply the filter, we need to open the tar stream and
                 # tweak it.
                 origtar = tarfile.open(fileobj=ifh, mode="r|")
-                with (
-                    ctx.stream_writer(fh) as compressor,
-                    tarfile.open(
-                        fileobj=compressor,
-                        mode="w:",
-                        format=origtar.format,
-                    ) as tar,
-                ):
+                with ctx.stream_writer(fh) as compressor, tarfile.open(
+                    fileobj=compressor,
+                    mode="w:",
+                    format=origtar.format,
+                ) as tar:
                     for tarinfo in origtar:
                         if tarinfo.isdir():
                             continue