From: Martin Jambor <mjambor@suse.cz>
Date: Tue, 3 Oct 2023 17:09:33 +0000 (+0200)
Subject: contrib/mklog.py: Fix issues reported by flake8
X-Git-Tag: basepoints/gcc-15~5754
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f18797450549e4f67a75ee2b08cd639ae1fa54d;p=thirdparty%2Fgcc.git

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 --git a/contrib/mklog.py b/contrib/mklog.py
index effe5aa1ca52..1c2c3216e9e1 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')