diff mbox series

[(pushed)] gcc-changelog: do not use PatchSet.from_filename

Message ID 8535eafd-58cc-5454-a92c-6aaf242b686b@suse.cz
State Repeat Merge
Headers
Series [(pushed)] gcc-changelog: do not use PatchSet.from_filename |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Martin Liška Dec. 16, 2022, 11:23 a.m. UTC 
  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 mbox series

Patch

diff --git a/contrib/gcc-changelog/git_email.py b/contrib/gcc-changelog/git_email.py
index 093c887ba4c..f3773f178ea 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):