Adding upstream version 2.18.1.upstream/2.18.1

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

4 files changed, 10 insertions, 10 deletions

diff --git a/testing/zipapp/Dockerfile b/testing/zipapp/Dockerfile
index e21d5fe..7c74c1b 100644
--- a/testing/zipapp/Dockerfile
+++ b/testing/zipapp/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:focal
 RUN : \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -10,5 +10,5 @@ RUN : \
 
 ENV LANG=C.UTF-8 PATH=/venv/bin:$PATH
 RUN : \
-    && python3.6 -mvenv /venv \
+    && python3 -mvenv /venv \
     && pip install --no-cache-dir pip setuptools wheel no-manylinux --upgrade
diff --git a/testing/zipapp/entry b/testing/zipapp/entry
index 87f9291..15758d9 100755
--- a/testing/zipapp/entry
+++ b/testing/zipapp/entry
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+from __future__ import annotations
+
 import os.path
 import shutil
 import stat
@@ -59,10 +61,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)
 
diff --git a/testing/zipapp/make b/testing/zipapp/make
index effc812..37b5c35 100755
--- a/testing/zipapp/make
+++ b/testing/zipapp/make
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+from __future__ import annotations
+
 import argparse
 import base64
 import hashlib
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)