From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 723613830FC0; Fri, 16 Dec 2022 10:02:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 723613830FC0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1671184962; bh=FgCHCDfSEbpGgNcEErvXTByW+hSEMzZxIBqn8IMh/cU=; h=From:To:Subject:Date:From; b=ZdgM+1F7YPwPo74GRKiqJ172GeI4Xxma7L/8BUihoTqdWfGS8fsdwyLVGxSESMY6b UShLirAixzRDPjHWUofPed4a0oyOTk0ywCA1G+u1PM+mJEU6gQOa0qisBeo734rs2D wEJZ0HOw79imTEFFHRFmnapYqfLZ7MCMuC6gCvLE= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4741] gcc-changelog/git_email.py: Support older unidiff.PatchSet X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/master X-Git-Oldrev: 340ddeae6611f6ab524211a009e97a85b4bba549 X-Git-Newrev: 8f2a8be579fc6acadb9fc356701fcb5e7b0feed5 Message-Id: <20221216100242.723613830FC0@sourceware.org> Date: Fri, 16 Dec 2022 10:02:42 +0000 (GMT) List-Id: https://gcc.gnu.org/g:8f2a8be579fc6acadb9fc356701fcb5e7b0feed5 commit r13-4741-g8f2a8be579fc6acadb9fc356701fcb5e7b0feed5 Author: Tobias Burnus Date: Fri Dec 16 11:01:22 2022 +0100 gcc-changelog/git_email.py: Support older unidiff.PatchSet Commit "unidiff: use newline='\n' argument", r13-4603-gb045179973161115c7ea029b2788f5156fc55cda, added support CR on a line, but that broke support for older unidiff.PatchSet. This patch uses a fallback for git_email.py (drop argument) if not available (TypeError exception) but keeps using it in test_email.py unconditionally. contrib/ChangeLog: * gcc-changelog/git_email.py (GitEmail:__init__): Support older unidiff.PatchSet that do not have a newline= argument of from_filename. Diff: --- contrib/gcc-changelog/git_email.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/gcc-changelog/git_email.py b/contrib/gcc-changelog/git_email.py index ef50ebfb7fd..093c887ba4c 100755 --- a/contrib/gcc-changelog/git_email.py +++ b/contrib/gcc-changelog/git_email.py @@ -39,7 +39,11 @@ unidiff_supports_renaming = hasattr(PatchedFile(), 'is_rename') class GitEmail(GitCommit): def __init__(self, filename): self.filename = filename - diff = PatchSet.from_filename(filename, newline='\n') + try: + diff = PatchSet.from_filename(filename, newline='\n') + except TypeError: + # Older versions don't have the newline argument + diff = PatchSet.from_filename(filename) date = None author = None subject = ''