summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/asciidoc/asciidoc/detect-python-version.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/asciidoc/asciidoc/detect-python-version.patch')
-rw-r--r--meta/recipes-extended/asciidoc/asciidoc/detect-python-version.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-extended/asciidoc/asciidoc/detect-python-version.patch b/meta/recipes-extended/asciidoc/asciidoc/detect-python-version.patch
new file mode 100644
index 0000000000..14c1cd806e
--- /dev/null
+++ b/meta/recipes-extended/asciidoc/asciidoc/detect-python-version.patch
@@ -0,0 +1,42 @@
1From 44d2d6095246124c024230f89c1029794491839f Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
3Date: Fri, 30 Oct 2020 15:10:35 +0100
4Subject: [PATCH] Properly detect and compare Python version 3.10+ (#151)
5
6Upstream commit: https://github.com/asciidoc-py/asciidoc-py/commit/44d2d6095246124c024230f89c1029794491839f
7
8Slightly modified to cleanly apply to asciidoc 8.6.9:
9- VERSION and MIN_PYTHON_VERSION changed to reflect values in 8.6.9
10- line numbers corrected to eliminate offset warnings
11
12Upstream-Status: Backport
13Signed-off-by: Steve Sakoman <steve@sakoman.com>
14
15---
16 asciidoc.py | 6 +++---
17 1 file changed, 3 insertions(+), 3 deletions(-)
18
19diff --git a/asciidoc.py b/asciidoc.py
20index f960e7d8..42868c4b 100755
21--- a/asciidoc.py
22+++ b/asciidoc.py
23@@ -30,7 +30,7 @@
24 # Used by asciidocapi.py #
25 VERSION = '8.6.10' # See CHANGELOG file for version history.
26
27-MIN_PYTHON_VERSION = '3.4' # Require this version of Python or better.
28+MIN_PYTHON_VERSION = (3, 4) # Require this version of Python or better.
29
30 # ---------------------------------------------------------------------------
31 # Program constants.
32@@ -4704,8 +4704,8 @@ def init(self, cmd):
33 directory.
34 cmd is the asciidoc command or asciidoc.py path.
35 """
36- if float(sys.version[:3]) < float(MIN_PYTHON_VERSION):
37- message.stderr('FAILED: Python %s or better required' % MIN_PYTHON_VERSION)
38+ if sys.version_info[:2] < MIN_PYTHON_VERSION:
39+ message.stderr('FAILED: Python %d.%d or better required' % MIN_PYTHON_VERSION)
40 sys.exit(1)
41 if not os.path.exists(cmd):
42 message.stderr('FAILED: Missing asciidoc command: %s' % cmd)