From 66c2f03d4cbfdefa489ba6280d2cbb13efec1ad1 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 16 Dec 2022 12:21:59 +0100 Subject: [PATCH] gcc-changelog: do not use PatchSet.from_filename Use rather PatchSet constructor where we can pass properly opened file with newline='\n'. contrib/ChangeLog: * gcc-changelog/git_email.py: Use PatchSet constructor as newline argument is not supported with older unidiff library. --- contrib/gcc-changelog/git_email.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/contrib/gcc-changelog/git_email.py b/contrib/gcc-changelog/git_email.py index 093c887..f3773f1 100755 --- a/contrib/gcc-changelog/git_email.py +++ b/contrib/gcc-changelog/git_email.py @@ -39,18 +39,15 @@ unidiff_supports_renaming = hasattr(PatchedFile(), 'is_rename') class GitEmail(GitCommit): def __init__(self, filename): self.filename = filename - 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 = '' subject_last = False - with open(self.filename, 'r') as f: - lines = f.read().splitlines() + with open(self.filename, newline='\n') as f: + data = f.read() + diff = PatchSet(data) + lines = data.splitlines() lines = list(takewhile(lambda line: line != '---', lines)) for line in lines: if line.startswith(DATE_PREFIX): -- 2.7.4