b70343dc0c
- Resolves: RHEL-76835 - Web console doesn't show the sub suffix of ou=foo,ou=people,dc=example,dc=com. - Resolves: RHEL-86320 - [RFE] Support updating/renewing TLS certificate without restarting slapd - Resolves: RHEL-110192 - ns-slapd doesn't support PQC keys - Resolves: RHEL-111220 - RHDS-11.9 dsctl db2index --attr recreates all indexes instead of selected ones - Resolves: RHEL-111931 - Improve error messages for dsconf localpwp list - Resolves: RHEL-121981 - Setting password history count to 0 does not flush history - Resolves: RHEL-122625 - ipa-healthcheck is complaining about missing or incorrectly configured system indexes. - Resolves: RHEL-128906 - Scalability issue of replication online initialization with large database - Resolves: RHEL-137786 - Upgrading IDM to latest version: 389-ds-base and ipa-server breaks replication - Resolves: RHEL-146769 - Remove memberof_del_dn_from_groups from MemberOf plugin
49 lines
2.0 KiB
Diff
49 lines
2.0 KiB
Diff
From 4a73a31e6c91e507e5aa2cba1e5bd55d1d07894d Mon Sep 17 00:00:00 2001
|
|
From: Mark Reynolds <mreynolds@redhat.com>
|
|
Date: Mon, 12 Jan 2026 13:53:05 -0500
|
|
Subject: [PATCH] Issue 7184 - argparse.HelpFormatter _format_actions_usage()
|
|
is deprecated
|
|
|
|
Description:
|
|
|
|
_format_actions_usage() was removed in python 3.15. Instead we can use
|
|
_get_actions_usage_parts() but it also behaves differently between
|
|
python 3.14 and 3.15 so we need special handling.
|
|
|
|
Relates: https://github.com/389ds/389-ds-base/issues/7184
|
|
|
|
Reviewed by: spichugi(Thanks!)
|
|
---
|
|
src/lib389/lib389/cli_base/__init__.py | 15 ++++++++++++++-
|
|
1 file changed, 14 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/lib389/lib389/cli_base/__init__.py b/src/lib389/lib389/cli_base/__init__.py
|
|
index 06b8f9964..f1055aadc 100644
|
|
--- a/src/lib389/lib389/cli_base/__init__.py
|
|
+++ b/src/lib389/lib389/cli_base/__init__.py
|
|
@@ -413,7 +413,20 @@ class CustomHelpFormatter(argparse.HelpFormatter):
|
|
|
|
def _format_usage(self, usage, actions, groups, prefix):
|
|
usage = super(CustomHelpFormatter, self)._format_usage(usage, actions, groups, prefix)
|
|
- formatted_options = self._format_actions_usage(parent_arguments, [])
|
|
+
|
|
+ if sys.version_info < (3, 13):
|
|
+ # Use _format_actions_usage() for Python 3.12 and earlier
|
|
+ formatted_options = self._format_actions_usage(parent_arguments, [])
|
|
+ else:
|
|
+ # Use _get_actions_usage_parts() for Python 3.13 and later
|
|
+ action_parts = self._get_actions_usage_parts(parent_arguments, [])
|
|
+ if sys.version_info >= (3, 15):
|
|
+ # Python 3.15 returns a tuple (list of actions, count of actions)
|
|
+ formatted_options = ' '.join(action_parts[0])
|
|
+ else:
|
|
+ # Python 3.13 and 3.14 return a list of actions
|
|
+ formatted_options = ' '.join(action_parts)
|
|
+
|
|
# If formatted_options already in usage - remove them
|
|
if formatted_options in usage:
|
|
usage = usage.replace(f' {formatted_options}', '')
|
|
--
|
|
2.52.0
|
|
|