From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id A0BBD3858021; Mon, 31 Jan 2022 10:47:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A0BBD3858021 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6944] [Ada] doc/share/conf.py: fix string handling X-Act-Checkin: gcc X-Git-Author: Pierre-Marie de Rodat X-Git-Refname: refs/heads/master X-Git-Oldrev: 2dbc237e8605bb87f8b25adc455436dcba41fce8 X-Git-Newrev: 36c155c893954040236832e80756ba79cca61185 Message-Id: <20220131104717.A0BBD3858021@sourceware.org> Date: Mon, 31 Jan 2022 10:47:17 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jan 2022 10:47:17 -0000 https://gcc.gnu.org/g:36c155c893954040236832e80756ba79cca61185 commit r12-6944-g36c155c893954040236832e80756ba79cca61185 Author: Pierre-Marie de Rodat Date: Tue Jan 25 13:27:36 2022 +0000 [Ada] doc/share/conf.py: fix string handling gcc/ada/ * doc/share/conf.py: Remove spurious call to ".decode()". Diff: --- gcc/ada/doc/share/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/ada/doc/share/conf.py b/gcc/ada/doc/share/conf.py index 0f7f963d3c7..bb36bfa0c6a 100644 --- a/gcc/ada/doc/share/conf.py +++ b/gcc/ada/doc/share/conf.py @@ -43,7 +43,7 @@ def get_gnat_version(): r'constant String := "([^\(\)]+)\(.*\)?";', gnatvsn_content) if m: - return m.group(1).strip().decode() + return m.group(1).strip() else: if texi_fsf and os.path.exists(basever): return ''