[gcc r14-4385] contrib/mklog.py: Fix issues reported by flake8

Martin Jambor jamborm@gcc.gnu.org
Tue Oct 3 17:10:18 GMT 2023


https://gcc.gnu.org/g:5f18797450549e4f67a75ee2b08cd639ae1fa54d

commit r14-4385-g5f18797450549e4f67a75ee2b08cd639ae1fa54d
Author: Martin Jambor <mjambor@suse.cz>
Date:   Tue Oct 3 19:09:33 2023 +0200

    contrib/mklog.py: Fix issues reported by flake8
    
    The testing infrastructure built by Martin Liška contains checking a
    few python scripts in contrib witha tool flake8.  That tool recently
    complains that:
    
      contrib/mklog.py:360:45: E711 comparison to None should be 'if cond is None:'
      contrib/mklog.py:362:1: E305 expected 2 blank lines after class or function definition, found 1
    
    I'd like to silence these with the following, hopefully trivial,
    changes.  However, I have only tested the changes by running flake8
    again and running ./contrib/mklog.py --help.
    
    Is this good for trunk?  (Or should I stop using flake8 instead?)
    
    Thanks,
    
    Martin
    
    contrib/ChangeLog:
    
    2023-10-03  Martin Jambor  <mjambor@suse.cz>
    
            * mklog.py (skip_line_in_changelog): Compare to None using is instead
            of ==, add an extra newline after the function.

Diff:
---
 contrib/mklog.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/mklog.py b/contrib/mklog.py
index effe5aa1ca5..1c2c3216e9e 100755
--- a/contrib/mklog.py
+++ b/contrib/mklog.py
@@ -357,7 +357,8 @@ def update_copyright(data):
 
 
 def skip_line_in_changelog(line):
-    return FIRST_LINE_OF_END_RE.match(line) == None
+    return FIRST_LINE_OF_END_RE.match(line) is None
+
 
 if __name__ == '__main__':
     extra_args = os.getenv('GCC_MKLOG_ARGS')


More information about the Gcc-cvs mailing list