diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2022-12-16 11:01:22 +0100 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2022-12-16 11:02:24 +0100 |
| commit | 8f2a8be579fc6acadb9fc356701fcb5e7b0feed5 (patch) | |
| tree | ad94847657cb9cbf5c5eaae093226fb63f1925d2 | |
| parent | 340ddeae6611f6ab524211a009e97a85b4bba549 (diff) | |
| download | gcc-8f2a8be579fc6acadb9fc356701fcb5e7b0feed5.zip gcc-8f2a8be579fc6acadb9fc356701fcb5e7b0feed5.tar.gz gcc-8f2a8be579fc6acadb9fc356701fcb5e7b0feed5.tar.bz2 | |
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.
| -rwxr-xr-x | contrib/gcc-changelog/git_email.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/gcc-changelog/git_email.py b/contrib/gcc-changelog/git_email.py index ef50ebf..093c887 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 = '' |