From a16a0fe9629325ae1dd81827c6071ca972d7449a Mon Sep 17 00:00:00 2001
From: Refael Ackermann <refack@gmail.com>
Date: Sat, 13 Apr 2019 17:38:23 -0400
Subject: [PATCH] tools: python: activate more flake8 rules

PR-URL: https://github.com/nodejs/node/pull/25614
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
---
 .flake8                           | 2 +-
 tools/configure.d/nodedownload.py | 2 +-
 tools/icu/icutrim.py              | 6 +++---
 tools/js2c.py                     | 3 ++-
 tools/test.py                     | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.flake8 b/.flake8
index 07baf0a8a8aa71..18b5e6e0980633 100644
--- a/.flake8
+++ b/.flake8
@@ -1,3 +1,3 @@
 [flake8]
 exclude=.git,deps,lib,src,tools/gyp,tools/inspector_protocol,tools/pip,tools/v8_gypfiles/broken
-select=E9,F82
+select=E9,F63,F72,F82
diff --git a/tools/configure.d/nodedownload.py b/tools/configure.d/nodedownload.py
index e3fe2c517cc1bb..8734770fc78fff 100644
--- a/tools/configure.d/nodedownload.py
+++ b/tools/configure.d/nodedownload.py
@@ -107,7 +107,7 @@ def parse(opt):
     if not anOpt or anOpt == "":
       # ignore stray commas, etc.
       continue
-    elif anOpt is 'all':
+    elif anOpt == 'all':
       # all on
       theRet = dict((key, True) for (key) in download_types)
     else:
diff --git a/tools/icu/icutrim.py b/tools/icu/icutrim.py
index 116af32e0220a8..a825b18ac0c8c3 100755
--- a/tools/icu/icutrim.py
+++ b/tools/icu/icutrim.py
@@ -110,7 +110,7 @@
     print("Unknown endianness: %s" % options.endian)
     sys.exit(1)
 
-if options.endian is "host":
+if options.endian == "host":
     options.endian = endian
 
 if not os.path.isdir(options.tmpdir):
@@ -153,7 +153,7 @@ def runcmd(tool, cmd, doContinue=False):
         print("# " + cmd)
 
     rc = os.system(cmd)
-    if rc is not 0 and not doContinue:
+    if rc != 0 and not doContinue:
         print("FAILED: %s" % cmd)
         sys.exit(1)
     return rc
@@ -320,7 +320,7 @@ def removeList(count=0):
             print(i, file=fi)
         fi.close()
         rc = runcmd("icupkg","-r %s %s 2> %s" %  (removefile,outfile,hackerrfile),True)
-        if rc is not 0:
+        if rc != 0:
             if(options.verbose>5):
                 print("## Damage control, trying to parse stderr from icupkg..")
             fi = open(hackerrfile, 'rb')
diff --git a/tools/js2c.py b/tools/js2c.py
index eff44940c57ec6..d7d0c710b1d2bc 100755
--- a/tools/js2c.py
+++ b/tools/js2c.py
@@ -149,7 +149,8 @@ def ReadMacros(lines):
     hash = line.find('#')
     if hash != -1: line = line[:hash]
     line = line.strip()
-    if len(line) is 0: continue
+    if len(line) == 0:
+      continue
     const_match = CONST_PATTERN.match(line)
     if const_match:
       name = const_match.group(1)
diff --git a/tools/test.py b/tools/test.py
index 549908cf38b061..d58ffd5648b156 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -355,7 +355,7 @@ def HasRun(self, output):
     logger.info('  ---')
     logger.info('  duration_ms: %d.%d' %
       (total_seconds, duration.microseconds / 1000))
-    if self.severity is not 'ok' or self.traceback is not '':
+    if self.severity != 'ok' or self.traceback != '':
       if output.HasTimedOut():
         self.traceback = 'timeout\n' + output.output.stdout + output.output.stderr
       self._printDiagnostic()
@@ -1641,7 +1641,7 @@ def Main():
           continue
         archEngineContext = Execute([vm, "-p", "process.arch"], context)
         vmArch = archEngineContext.stdout.rstrip()
-        if archEngineContext.exit_code is not 0 or vmArch == "undefined":
+        if archEngineContext.exit_code != 0 or vmArch == "undefined":
           print("Can't determine the arch of: '%s'" % vm)
           print(archEngineContext.stderr.rstrip())
           continue