[2/2] contrib: fix python warnings for oe-stylize

Message ID 6b4456a84e51492f0df94a9c0816c984f333ada0.1639709734.git.jk@codeconstruct.com.au
State New
Headers show
Series [1/2] contrib: allow override-style syntax for vars & routines | expand

Commit Message

Jeremy Kerr Dec. 17, 2021, 2:59 a.m. UTC
I get a couple of python SyntaxWarnings when running oe-stylize:

  [jk@pecola meta-openembedded]$ python3 contrib/oe-stylize.py
  contrib/oe-stylize.py:372: SyntaxWarning: "is not" with a literal. Did you mean "!="?
    if line is not '':
  contrib/oe-stylize.py:389: SyntaxWarning: "is" with a literal. Did you mean "=="?
    if line.isspace() or line is '':

The 'is' operator is for object reference comparison, which is not what
we want here. Change to '==' / '!=' instead.

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
---
 contrib/oe-stylize.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py
index 67c06b1bb..30b460e12 100755
--- a/contrib/oe-stylize.py
+++ b/contrib/oe-stylize.py
@@ -369,7 +369,7 @@  if __name__ == "__main__":
             line = line.expandtabs().rstrip()
             # ignore empty lines (or line filled with spaces or tabs only)
             # so that rule6 is always respected
-            if line is not '':
+            if line != '':
                 lines.append(line)
 
     # -- parse the file --
@@ -386,7 +386,7 @@  if __name__ == "__main__":
         line = follow_rule(6, line)
 
         # ignore empty lines
-        if line.isspace() or line is '':
+        if line.isspace() or line == '':
             # flush comments into the olines
             for c in commentBloc:
                 olines.append(c)