From 347dceb1dd2edfa395c553c866ff62e842dbb56a Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 14 Jul 2025 09:44:32 +0100 Subject: [PATCH 1/2] Only error if redirect is different --- doc/sphinxext/redirect_from.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/sphinxext/redirect_from.py b/doc/sphinxext/redirect_from.py index 37b56373a3bf..5402c9a83f55 100644 --- a/doc/sphinxext/redirect_from.py +++ b/doc/sphinxext/redirect_from.py @@ -94,7 +94,8 @@ def run(self): domain = self.env.get_domain('redirect_from') current_doc = self.env.path2doc(self.state.document.current_source) redirected_reldoc, _ = self.env.relfn2path(redirected_doc, current_doc) - if redirected_reldoc in domain.redirects: + if (redirected_reldoc in domain.redirects + and domain.redirects[redirected_reldoc] != current_doc): raise ValueError( f"{redirected_reldoc} is already noted as redirecting to " f"{domain.redirects[redirected_reldoc]}") From ef45c7bf2b9f0a08b2d185b428ab5226918f0a10 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 14 Jul 2025 12:55:11 +0100 Subject: [PATCH 2/2] Note where redirect is trying to go --- doc/sphinxext/redirect_from.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/sphinxext/redirect_from.py b/doc/sphinxext/redirect_from.py index 5402c9a83f55..329352b3a3c8 100644 --- a/doc/sphinxext/redirect_from.py +++ b/doc/sphinxext/redirect_from.py @@ -94,11 +94,15 @@ def run(self): domain = self.env.get_domain('redirect_from') current_doc = self.env.path2doc(self.state.document.current_source) redirected_reldoc, _ = self.env.relfn2path(redirected_doc, current_doc) - if (redirected_reldoc in domain.redirects - and domain.redirects[redirected_reldoc] != current_doc): + if ( + redirected_reldoc in domain.redirects + and domain.redirects[redirected_reldoc] != current_doc + ): raise ValueError( f"{redirected_reldoc} is already noted as redirecting to " - f"{domain.redirects[redirected_reldoc]}") + f"{domain.redirects[redirected_reldoc]}\n" + f"Cannot also redirect it to {current_doc}" + ) domain.redirects[redirected_reldoc] = current_doc return [] pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy