Adding upstream version 2.18.1.upstream/2.18.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 4 deletions

diff --git a/testing/zipapp/python b/testing/zipapp/python
index 7184a1a..67910fc 100755
--- a/testing/zipapp/python
+++ b/testing/zipapp/python
@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 """A shim executable to put dependencies on sys.path"""
+from __future__ import annotations
+
 import argparse
 import os.path
 import runpy
@@ -36,10 +38,7 @@ def main() -> int:
         if sys.platform == 'win32':  # https://bugs.python.org/issue19124
             import subprocess
 
-            if sys.version_info < (3, 7):  # https://bugs.python.org/issue25942
-                return subprocess.Popen(cmd).wait()
-            else:
-                return subprocess.call(cmd)
+            return subprocess.call(cmd)
         else:
             os.execvp(cmd[0], cmd)