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.
This commit is contained in:
Tobias Burnus
2022-12-16 11:01:22 +01:00
parent 340ddeae66
commit 8f2a8be579
+5 -1
View File
@@ -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 = ''