Fixes to make Perlmutter tests pass

Author: forsyth2

zstash/extract.py

@@ -743,7 +743,11 @@ def _extractFiles_impl(  # noqa: C901
                     logger.debug("Valid md5: {} {}".format(md5, fname))
 
             elif extract_this_file:
-                tar.extract(tarinfo)
+                # Python 3.11 and earlier don't support the filter parameter at all
+                if sys.version_info >= (3, 12):
+                    tar.extract(tarinfo, filter="tar")
+                else:
+                    tar.extract(tarinfo)
                 # Note: tar.extract() will not restore time stamps of symbolic
                 # links. Could not find a Python-way to restore it either, so
                 # relying here on 'touch'. This is not the prettiest solution.

zstash/parallel.py

@@ -52,31 +52,30 @@ def __init__(self, tars_to_print: List[str], manager=None, *args, **kwargs):
     def wait_turn(
         self, worker, workers_curr_tar: str, indef_wait: bool = True, *args, **kwargs
     ):
-        import sys
 
         # Find the index of the worker's tar in the ordered list
         try:
             tar_index = self._tars_list.index(workers_curr_tar)
         except ValueError:
-            sys.stderr.write(f"DEBUG: Tar {workers_curr_tar} not in list!\n")
-            sys.stderr.flush()
+            # sys.stderr.write(f"DEBUG: Tar {workers_curr_tar} not in list!\n")
+            # sys.stderr.flush()
             return
 
-        sys.stderr.write(
-            f"DEBUG: Worker waiting for tar {workers_curr_tar} (index {tar_index}), current index is {self._current_tar_index.value}\n"
-        )
-        sys.stderr.flush()
+        # sys.stderr.write(
+        #        f"DEBUG: Worker waiting for tar {workers_curr_tar} (index {tar_index}), current index is {self._current_tar_index.value}\n"
+        #    )
+        # sys.stderr.flush()
 
         max_wait_time = 180.0
         start_time = time.time()
         attempted = False
 
         while True:
             if self._current_tar_index.value == tar_index:
-                sys.stderr.write(
-                    f"DEBUG: Worker got turn for tar {workers_curr_tar}!\n"
-                )
-                sys.stderr.flush()
+                # sys.stderr.write(
+                #     f"DEBUG: Worker got turn for tar {workers_curr_tar}!\n"
+                # )
+                # sys.stderr.flush()
                 return
 
             if attempted and not indef_wait: