public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Steve Traylen <steve.traylen@cern.ch>
To: git-commits@fedoraproject.org
Subject: [rpms/python-cliff] rawhide: Drop redundant patch
Date: Sun, 07 Jun 2026 19:32:33 GMT [thread overview]
Message-ID: <178086075339.1.10248837243557136515.rpms-python-cliff-dbfa49a0230e@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/python-cliff
Branch : rawhide
Commit : dbfa49a0230ec4032b9f944dfaaa401f5f809e80
Author : Steve Traylen <steve.traylen@cern.ch>
Date : 2026-06-07T21:32:09+02:00
Stats : +0/-50 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/python-cliff/c/dbfa49a0230ec4032b9f944dfaaa401f5f809e80?branch=rawhide
Log:
Drop redundant patch
[skip changelog]
---
diff --git a/391261c849c994ca2d3f42926497e633047ed8c7.patch b/391261c849c994ca2d3f42926497e633047ed8c7.patch
deleted file mode 100644
index b8a4dc3..0000000
--- a/391261c849c994ca2d3f42926497e633047ed8c7.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 391261c849c994ca2d3f42926497e633047ed8c7 Mon Sep 17 00:00:00 2001
-From: Thomas Goirand <zigo@debian.org>
-Date: Thu, 12 Feb 2026 14:53:35 +0100
-Subject: [PATCH] Fix cliff sphinxextention for Python 3.14
-
-sphinxtext.py's _format_usage() is using _format_actions_usage()
-from argparse argparse.HelpFormatter, which is a private API that
-is gone from Python 3.14. This patch rewrites that part without
-the gone function if _format_actions_usage() doesn't exist, so
-the code is compatible with Python >= 3.14.
-
-Signed-off-by: Thomas Goirand <zigo@debian.org>
-Change-Id: I0d18badf1fe03213cc4db9c5a2bebb1dddea9655
----
- cliff/sphinxext.py | 21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/cliff/sphinxext.py b/cliff/sphinxext.py
-index 1b16e10..acb6f0f 100644
---- a/cliff/sphinxext.py
-+++ b/cliff/sphinxext.py
-@@ -84,12 +84,23 @@ def _format_usage(parser: argparse.ArgumentParser) -> list[str]:
- re.VERBOSE,
- )
-
-- opt_usage = fmt._format_actions_usage(optionals, groups)
-- pos_usage = fmt._format_actions_usage(positionals, groups)
-+ if sys.version_info >= (3, 14):
-+ usage = parser.format_usage().strip()
-
-- opt_parts = part_regexp.findall(opt_usage)
-- pos_parts = part_regexp.findall(pos_usage)
-- parts = opt_parts + pos_parts
-+ if usage.lower().startswith("usage:"):
-+ usage = usage.split(":", 1)[1].strip()
-+
-+ if usage.startswith(parser.prog):
-+ usage = usage[len(parser.prog) :].lstrip()
-+
-+ parts = part_regexp.findall(usage)
-+ else:
-+ opt_usage = fmt._format_actions_usage(optionals, groups)
-+ pos_usage = fmt._format_actions_usage(positionals, groups)
-+
-+ opt_parts = part_regexp.findall(opt_usage)
-+ pos_parts = part_regexp.findall(pos_usage)
-+ parts = opt_parts + pos_parts
-
- if len(' '.join([parser.prog] + parts)) < 72:
- return [' '.join([parser.prog] + parts)]
reply other threads:[~2026-06-07 19:32 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178086075339.1.10248837243557136515.rpms-python-cliff-dbfa49a0230e@fedoraproject.org \
--to=steve.traylen@cern.ch \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox