diff options
| author | Yaroslav Halchenko <debian@onerussian.com> | 2017-11-27 20:35:19 -0500 |
|---|---|---|
| committer | Yaroslav Halchenko <debian@onerussian.com> | 2017-11-27 20:35:19 -0500 |
| commit | 6ee08fce6ec508fdc6e577e3e507b342d048fa16 (patch) | |
| tree | 47b8bac37afca3878d4535d3c13db38e55242628 /git/diff.py | |
| parent | 0a96030d82fa379d24b952a58eed395143950c7b (diff) | |
| download | gitpython-6ee08fce6ec508fdc6e577e3e507b342d048fa16.tar.gz | |
RF: primarily flake8 lints + minor RF to reduce duplication in PATHEXT
I did keep some "bare" except with catch all Exception: , while tried to disable
flake8 complaints where clearly all exceptions are to be catched
Diffstat (limited to 'git/diff.py')
| -rw-r--r-- | git/diff.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/git/diff.py b/git/diff.py index 16c782f3..28c10e49 100644 --- a/git/diff.py +++ b/git/diff.py @@ -313,20 +313,20 @@ class Diff(object): h %= self.b_blob.path msg = '' - l = None # temp line - ll = 0 # line length + line = None # temp line + line_length = 0 # line length for b, n in zip((self.a_blob, self.b_blob), ('lhs', 'rhs')): if b: - l = "\n%s: %o | %s" % (n, b.mode, b.hexsha) + line = "\n%s: %o | %s" % (n, b.mode, b.hexsha) else: - l = "\n%s: None" % n + line = "\n%s: None" % n # END if blob is not None - ll = max(len(l), ll) - msg += l + line_length = max(len(line), line_length) + msg += line # END for each blob # add headline - h += '\n' + '=' * ll + h += '\n' + '=' * line_length if self.deleted_file: msg += '\nfile deleted in rhs' |