From patchwork Fri Sep 6 06:53:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 825913 Delivered-To: patch@linaro.org Received: by 2002:adf:a345:0:b0:367:895a:4699 with SMTP id d5csp662286wrb; Thu, 5 Sep 2024 23:57:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVow6p/4RNQAMEw/OYqvdIK3fYwTyUG/fcnPpd+4nN+aU4h6IXoPJSpsMiSGYTKe6Wy3apfIQ==@linaro.org X-Google-Smtp-Source: AGHT+IHeL/AGWebzD8mwh1h9oKiwKAgs22u4bDl6tXn9ZKM/+iPHdkYUfe40O2ONx470MgoFdDNi X-Received: by 2002:a05:622a:5cd:b0:44f:f6da:efaf with SMTP id d75a77b69052e-4580c786469mr16938061cf.44.1725605852302; Thu, 05 Sep 2024 23:57:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725605852; cv=none; d=google.com; s=arc-20240605; b=fFQ+L/EGNa1cmdhBLmU7RosVAREJTEpDXkFyZcHY9jq/Q27w7DMX/UCIWogs9nbNyX BIJBlxYArcl7eeM1B4MFj7OZgLoHHE8DTM5wQMpKlYRGG49SGicFbDWgmT2W4oEupsUw tHUf32ZLLQVGLeP/z7KfvntF5PpocnmwwOItH6OouCg/VS9KXjNv52qIgq4ojQd1VnEJ won8rNpg0Igmg/0+vPtHP/1n/UJRP/8sOVydQ9QMr8d67P00BKKvK7qUymmrEezm2bhw U4fX3QKjN0QK6Zgn+xypi0aXbiNnDdmnxdiIiGOjTP0bIdw0JvDSSNrCnQ6FaJc+aPdx CYKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=LxVt8Zqzx+mHsb5SPIqxofKuCv6ai9lg4miz52rF5Qk=; fh=He0A/96iGS/hdBTIvTFKPoE7yByjlEm52ubAJxr7bqo=; b=cFF3caLBBcD+iXoNu6iJXYjXml85qNj59CGIjOCz0dZXpfLgqY7JbyZSOyhdEk7EJ/ LqJni7Ql1rjdQdI/OeMKYhHZYzb1yByu311PWaPZw9plBbx2it6DWgaH5M4oopeGb5IR YPDXyFkqX6uxcMTkU844Nu+rb1uf3JEkPFVLE20wJMUO/0bC5lfHqegVe4EmsYx/5rvf IVenLjTPKXaDbhQoEbkwmSp/fIk4zxX0HmghQ45ANBQ5Ht7vf+eniVN3FQn7RSfzAguP jmKaIhWF7AAW6KHJPGGGsRtJQpKGLsyQr5cm1pOKub2GN1KJC8lIr1ABau53Y1zVBP2u v0Qw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-45809c59e30si20173761cf.163.2024.09.05.23.57.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Sep 2024 23:57:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smStQ-0004cD-Dz; Fri, 06 Sep 2024 02:56:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1smStP-0004Sg-5r; Fri, 06 Sep 2024 02:56:27 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1smStN-0003Px-E7; Fri, 06 Sep 2024 02:56:26 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 3DA5D8C24D; Fri, 6 Sep 2024 09:53:13 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 06F03133405; Fri, 6 Sep 2024 09:54:31 +0300 (MSK) Received: (nullmailer pid 43503 invoked by uid 1000); Fri, 06 Sep 2024 06:54:30 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev Subject: [Stable-8.2.7 24/53] docs/sphinx/depfile.py: Handle env.doc2path() returning a Path not a str Date: Fri, 6 Sep 2024 09:53:54 +0300 Message-Id: <20240906065429.42415-24-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell In newer versions of Sphinx the env.doc2path() API is going to change to return a Path object rather than a str. This was originally visible in Sphinx 8.0.0rc1, but has been rolled back for the final 8.0.0 release. However it will probably emit a deprecation warning and is likely to change for good in 9.0: https://github.com/sphinx-doc/sphinx/issues/12686 Our use in depfile.py assumes a str, and if it is passed a Path it will fall over: Handler for event 'build-finished' threw an exception (exception: unsupported operand type(s) for +: 'PosixPath' and 'str') Wrapping the env.doc2path() call in str() will coerce a Path object to the str we expect, and have no effect in older Sphinx versions that do return a str. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2458 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20240729120533.2486427-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daudé (cherry picked from commit 48e5b5f994bccf161dd88a67fdd819d4bfb400f1) Signed-off-by: Michael Tokarev diff --git a/docs/sphinx/depfile.py b/docs/sphinx/depfile.py index afdcbcec6e..e74be6af98 100644 --- a/docs/sphinx/depfile.py +++ b/docs/sphinx/depfile.py @@ -19,7 +19,7 @@ def get_infiles(env): for x in env.found_docs: - yield env.doc2path(x) + yield str(env.doc2path(x)) yield from ((os.path.join(env.srcdir, dep) for dep in env.dependencies[x])) for mod in sys.modules.values():