5edf3c3fa7
There was a gap between 1 and 3, which was not ideal. This way, we don't have to deal with the numbers.
65 lines
2.6 KiB
Diff
65 lines
2.6 KiB
Diff
From d0fbcd20a24114fab5b6df71e86065b9a7c7576d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
|
Date: Thu, 14 Sep 2023 14:20:27 +0200
|
|
Subject: [PATCH] Ensure Python 3.12+ compatibility in check_console_script
|
|
|
|
In f4d046c0cec1dab17f65853442b1da7d341e2915 an assumption was made
|
|
(correct at the time), that only the importlib.metadata backport,
|
|
`importlib_metadata`, returns a tuple of entry points.
|
|
|
|
However, importlib.metadata in Python 3.12+ behaves the same.
|
|
|
|
This caused a KeyError exception to be thrown on Python 3.12,
|
|
as reported repeatedly be testers of Fedora Linux 39 in:
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=2231593
|
|
|
|
This change adjusts the conditional used in check_console_script
|
|
to assume both the backport and Python 3.12+ return a tuple.
|
|
|
|
While not obvious from the test failures output,
|
|
this change also fixes the following TestBashGlobal tests failures:
|
|
|
|
- test_console_script_module
|
|
- test_console_script_module_wheel
|
|
- test_console_script_package
|
|
- test_console_script_package_wheel
|
|
|
|
For the reference, the failures looked like this:
|
|
|
|
FAIL: test_console_script_module (__main__.TestBashGlobal.test_console_script_module)
|
|
Test completing a console_script for a module.
|
|
----------------------------------------------------------------------
|
|
Traceback (most recent call last):
|
|
File ".../argcomplete/test/test.py", line 1376, in test_console_script_module
|
|
self._test_console_script()
|
|
File ".../argcomplete/test/test.py", line 1370, in _test_console_script
|
|
self.assertEqual(self.sh.run_command(command), "arg\r\n")
|
|
AssertionError: "usage: test-module [-h] {arg}\r\ntest-mo[66 chars]\r\n" != 'arg\r\n'
|
|
+ arg
|
|
- usage: test-module [-h] {arg}
|
|
- test-module: error: argument arg: invalid choice: 'a' (choose from 'arg')
|
|
|
|
Fixes https://github.com/kislyuk/argcomplete/issues/440
|
|
---
|
|
argcomplete/_check_console_script.py | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/argcomplete/_check_console_script.py b/argcomplete/_check_console_script.py
|
|
index 3f838e4..7bbe59a 100644
|
|
--- a/argcomplete/_check_console_script.py
|
|
+++ b/argcomplete/_check_console_script.py
|
|
@@ -38,7 +38,8 @@ def main():
|
|
|
|
# The importlib_metadata backport returns a tuple of entry point objects
|
|
# whereas the official library returns a SelectableGroups object
|
|
- if not use_entry_points_backport:
|
|
+ # Python 3.12+ behaves like the importlib_metadata backport
|
|
+ if not use_entry_points_backport and sys.version_info < (3, 12):
|
|
entry_points = entry_points["console_scripts"]
|
|
|
|
entry_points = [ep for ep in entry_points \
|
|
--
|
|
2.41.0
|
|
|