From 3a211cc91bf625edc868d839c7b1502f024befb5 Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Jun 16 2020 11:57:38 +0000
Subject: Use compileall from stdlib for Python >= 3.9


---

diff --git a/macros.pybytecompile b/macros.pybytecompile
index 38ac84a..f34716b 100644
--- a/macros.pybytecompile
+++ b/macros.pybytecompile
@@ -28,9 +28,22 @@ py3_byte_compile () {\
     PYTHONPATH="%{_rpmconfigdir}/redhat" $python_binary -s -B -m compileall2 -o 0 -o 1 -s $RPM_BUILD_ROOT -p / $bytecode_compilation_path \
 }\
 \
+py39_byte_compile () {\
+    python_binary="%1"\
+    bytecode_compilation_path="%2"\
+    $python_binary -s -B -m compileall -o 0 -o 1 -s $RPM_BUILD_ROOT -p / $bytecode_compilation_path \
+}\
+\
 # Path to intepreter should not contain any arguments \
 [[ "%1" =~ " -" ]] && echo "ERROR py_byte_compile: Path to interpreter should not contain any arguments" >&2 && exit 1 \
 # Get version without a dot (36 instead of 3.6), bash doesn't compare floats well \
 python_version=$(%1 -c "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))") \
-# compileall2 Python module is not compatible with Python < 3.4 \
-if [ "$python_version" -ge 34 ]; then py3_byte_compile "%1" "%2"; else py2_byte_compile "%1" "%2"; fi
+# compileall2 is an enhanced fork of stdlib compileall module for Python >= 3.4 \
+# and it was merged back to stdlib in Python >= 3.9 \
+if [ "$python_version" -ge 39 ]; then \
+py39_byte_compile "%1" "%2"; \
+elif [ "$python_version" -ge 34 ]; then \
+py3_byte_compile "%1" "%2"; \
+else \
+py2_byte_compile "%1" "%2"; \
+fi
diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec
index 6f05af8..523d314 100644
--- a/python-rpm-macros.spec
+++ b/python-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           python-rpm-macros
 Version:        3.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The common Python RPM macros
 
 # macros and lua: MIT, compileall2.py: PSFv2
@@ -107,6 +107,9 @@ install -m 644 compileall2.py %{buildroot}%{_rpmconfigdir}/redhat/
 
 
 %changelog
+* Tue Jun 16 2020 Lumír Balhar <lbalhar@redhat.com> - 3.9-4
+- Use compileall from stdlib for Python >= 3.9
+
 * Thu Jun 11 2020 Miro Hrončok <mhroncok@redhat.com> - 3.9-3
 - Allow to combine %%pycached with other macros (e.g. %%exclude or %%ghost) (#1838992)