bug 1463425 - Fix flake8/pep8 issue by hand in config/ r=gps

MozReview-Commit-ID: 6B60uh4n2nY

--HG--
extra : rebase_source : 4fd44789a9ee6376c72bae1132f73c81dd1eacbc

Author: sylvestre

config/MozZipFile.py

@@ -59,7 +59,7 @@ def writestr(self, zinfo_or_arcname, bytes):
         # as the old, reuse the existing entry.
 
         doSeek = False  # store if we need to seek to the eof after overwriting
-        if self.NameToInfo.has_key(zinfo.filename):
+        if zinfo.filename in self.NameToInfo:
             # Find the last ZipInfo with our name.
             # Last, because that's catching multiple overwrites
             i = len(self.filelist)

config/check_js_msg_encoding.py

@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # This script checks encoding of the files that define JSErrorFormatStrings.
 #
 # JSErrorFormatString.format member should be in ASCII encoding.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 
 from __future__ import print_function
 
@@ -41,7 +41,7 @@ def check_single_file(filename):
         data = f.read()
         try:
             data.decode(expected_encoding)
-        except:
+        except Exception:
             log_fail(filename, 'not in {} encoding'.format(expected_encoding))
 
     log_pass(filename, 'ok')

config/check_js_opcode.py

@@ -3,9 +3,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # This script checks bytecode documentation in js/src/vm/Opcodes.h
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 
 from __future__ import print_function
 

config/check_source_count.py

@@ -11,7 +11,6 @@
 #   check_source_count.py.
 from __future__ import print_function
 import sys
-import os
 import re
 
 search_string = sys.argv[1]

config/check_spidermonkey_style.py

@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # This script checks various aspects of SpiderMonkey code style.  The current checks are as
 # follows.
 #
@@ -33,7 +33,7 @@
 #   statement should go, even to a human.  Therefore, we check the #include
 #   statements within each #if/#endif block (including nested ones) in
 #   isolation, but don't try to do any order checking between such blocks.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 
 from __future__ import print_function
 
@@ -340,7 +340,7 @@ def check_style(enable_fixup):
 def module_name(name):
     '''Strip the trailing .cpp, .h, inlines.h or -inl.h from a filename.'''
 
-    return name.replace('inlines.h', '').replace('-inl.h', '').replace('.h', '').replace('.cpp', '')
+    return name.replace('inlines.h', '').replace('-inl.h', '').replace('.h', '').replace('.cpp', '')  # NOQA: E501
 
 
 def is_module_header(enclosing_inclname, header_inclname):
@@ -773,8 +773,8 @@ def main():
     elif sys.argv[1:] == []:
         fixup = False
     else:
-        print("TEST-UNEXPECTED-FAIL | check_spidermonkey_style.py | unexpected command line options: " +
-              repr(sys.argv[1:]))
+        print("TEST-UNEXPECTED-FAIL | check_spidermonkey_style.py | unexpected command "
+              "line options: " + repr(sys.argv[1:]))
         sys.exit(1)
 
     ok = check_style(fixup)

config/check_vanilla_allocations.py

@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 # All heap allocations in SpiderMonkey must go through js_malloc, js_calloc,
 # js_realloc, and js_free.  This is so that any embedder who uses a custom
 # allocator (by defining JS_USE_CUSTOM_ALLOCATOR) will see all heap allocation
@@ -34,7 +34,7 @@
 # because vanilla delete/delete[] calls don't make sense without corresponding
 # vanilla new/new[] calls, and any explicit calls will be caught by Valgrind's
 # mismatched alloc/free checking.
-#----------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 
 from __future__ import print_function
 

config/createprecomplete.py

@@ -6,7 +6,6 @@
 # longer present in a complete update. The current working directory is used for
 # the location to enumerate and to create the precomplete file.
 
-import sys
 import os
 
 

config/external/ffi/preprocess_libffi_asm.py

@@ -11,6 +11,7 @@
 import shlex
 import subprocess
 
+
 def main(output, input_asm, defines, includes):
     defines = shlex.split(defines)
     includes = shlex.split(includes)

config/external/ffi/subst_header.py

@@ -8,6 +8,7 @@
 import buildconfig
 from mozbuild.preprocessor import Preprocessor
 
+
 def main(output, input_file):
     pp = Preprocessor()
     pp.context.update({
@@ -21,5 +22,6 @@ def main(output, input_file):
     pp.out = output
     pp.do_include(input_file)
 
+
 if __name__ == '__main__':
     main(*sys.agv[1:])

config/find_OOM_errors.py

@@ -16,13 +16,11 @@
 """
 
 
-import hashlib
 import re
 import shlex
 import subprocess
 import sys
 import threading
-import time
 
 from optparse import OptionParser
 
@@ -69,7 +67,7 @@ def run(self):
         stdout_worker.join()
         stderr_worker.join()
 
-    except KeyboardInterrupt as e:
+    except KeyboardInterrupt:
         sys.exit(-1)
 
     stdout, stderr = stdout_worker.all, stderr_worker.all
@@ -135,7 +133,7 @@ def clean_voutput(err):
                  r"\1x", err, flags=re.MULTILINE)
     err = re.sub(r"(^\s+Invalid read of size )\d+",
                  r"\1x", err, flags=re.MULTILINE)
-    err = re.sub(r"(^\s+Address 0x)[0-9A-Fa-f]+( is )\d+( bytes inside a block of size )[0-9,]+( free'd)",
+    err = re.sub(r"(^\s+Address 0x)[0-9A-Fa-f]+( is )\d+( bytes inside a block of size )[0-9,]+( free'd)",  # NOQA: E501
                  r"\1\2\3\4", err, flags=re.MULTILINE)
 
     # Skip the repeating bit due to the segfault
@@ -170,7 +168,7 @@ def remove_failed_allocation_backtraces(err):
 
 
 def clean_output(err):
-    err = re.sub(r"^js\(\d+,0x[0-9a-f]+\) malloc: \*\*\* error for object 0x[0-9a-f]+: pointer being freed was not allocated\n\*\*\* set a breakppoint in malloc_error_break to debug\n$",
+    err = re.sub(r"^js\(\d+,0x[0-9a-f]+\) malloc: \*\*\* error for object 0x[0-9a-f]+: pointer being freed was not allocated\n\*\*\* set a breakpoint in malloc_error_break to debug\n$",  # NOQA: E501
                  "pointer being freed was not allocated", err, flags=re.MULTILINE)
 
     return err
@@ -213,7 +211,7 @@ def clean_output(err):
 (OPTIONS, args) = parser.parse_args()
 
 
-if OPTIONS.regression != None:
+if OPTIONS.regression is not None:
     # TODO: This should be expanded as we get a better hang of the OOM problems.
     # For now, we'll just check that the number of OOMs in one short file does not
     # increase.
@@ -226,7 +224,7 @@ def clean_output(err):
         files = [f for f in files if f.find(args[0]) != -1]
 
 
-if OPTIONS.regression == None:
+if OPTIONS.regression is None:
     # Don't use a logfile, this is automated for tinderbox.
     log = file("../OOM_log", "w")
 
@@ -245,7 +243,7 @@ def clean_output(err):
     # TODO: revisit this.
     for i in range(20, max):
 
-        if OPTIONS.regression == None:
+        if OPTIONS.regression is None:
             print("Testing allocation {0}/{1} in {2}".format(i, max, f))
         else:
             # something short for tinderbox, no space or \n
@@ -261,7 +259,7 @@ def clean_output(err):
         # Failure
         else:
 
-            if OPTIONS.regression != None:
+            if OPTIONS.regression is not None:
                 # Just count them
                 num_failures += 1
                 continue
@@ -340,13 +338,13 @@ def clean_output(err):
             log.write("\n")
             log.flush()
 
-    if OPTIONS.regression == None:
+    if OPTIONS.regression is None:
         count_lines()
 
 print()
 
 # Do the actual regression check
-if OPTIONS.regression != None:
+if OPTIONS.regression is not None:
     expected_num_failures = OPTIONS.regression
 
     if num_failures != expected_num_failures:

config/make-stl-wrappers.py

@@ -3,9 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 from __future__ import print_function
 import os
-import re
 import string
-import sys
 from mozbuild.util import FileAvoidWrite
 
 

config/make-system-wrappers.py

@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 from __future__ import print_function
 import os
-import sys
 from mozbuild.util import FileAvoidWrite
 
 header_template = '''#pragma GCC system_header

config/nsinstall.py

@@ -16,7 +16,6 @@
 import os.path
 import sys
 import shutil
-import stat
 
 
 def _nsinstall_internal(argv):
@@ -57,7 +56,7 @@ def BadArg(option, opt, value, parser):
         # mode is specified
         try:
             options.m = int(options.m, 8)
-        except:
+        except Exception:
             sys.stderr.write('nsinstall: {0} is not a valid mode\n'
                              .format(options.m))
             return 1
@@ -89,7 +88,7 @@ def maybe_create_dir(dir, mode, try_again):
             return 0
 
     if options.X:
-        options.X = [os.path.abspath(p) for p in options.X]
+        options.X = [os.path.abspath(path) for path in options.X]
 
     if options.D:
         return maybe_create_dir(args[0], options.m, True)

config/printconfigsetting.py

@@ -10,7 +10,7 @@
 try:
     (file, section, key) = sys.argv[1:]
 except ValueError:
-    print "Usage: printconfigsetting.py <file> <section> <setting>"
+    print("Usage: printconfigsetting.py <file> <section> <setting>")
     sys.exit(1)
 
 with open(file) as fh:
@@ -25,7 +25,7 @@
     sys.exit(1)
 
 try:
-    print s[key]
+    print(s[key])
 except KeyError:
     print >>sys.stderr, "Key %s not found." % key
     sys.exit(1)

config/rebuild_check.py

@@ -20,7 +20,7 @@ def rebuild_check(args):
     deps = args[1:]
     t = mtime(target)
     if t < 0:
-        print target
+        print(target)
         return
 
     newer = []
@@ -33,15 +33,15 @@ def rebuild_check(args):
             newer.append(dep)
 
     if newer and removed:
-        print 'Rebuilding %s because %s changed and %s was removed' % (
-            target, ', '.join(newer), ', '.join(removed))
+        print('Rebuilding %s because %s changed and %s was removed' % (
+            target, ', '.join(newer), ', '.join(removed)))
     elif newer:
-        print 'Rebuilding %s because %s changed' % (target, ', '.join(newer))
+        print('Rebuilding %s because %s changed' % (target, ', '.join(newer)))
     elif removed:
-        print 'Rebuilding %s because %s was removed' % (
-            target, ', '.join(removed))
+        print('Rebuilding %s because %s was removed' % (
+            target, ', '.join(removed)))
     else:
-        print 'Rebuilding %s for an unknown reason' % target
+        print('Rebuilding %s for an unknown reason' % target)
 
 
 if __name__ == '__main__':

config/tests/unit-mozunit.py

@@ -2,7 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-import sys
 import os
 from mozunit import main, MockedOpen
 import unittest

config/tests/unit-printprereleasesuffix.py

@@ -1,7 +1,5 @@
 import unittest
 
-import sys
-import os.path
 import mozunit
 
 from printprereleasesuffix import get_prerelease_suffix

config/tests/unitMozZipFile.py

@@ -6,7 +6,6 @@
 
 import shutil
 import os
-import re
 import sys
 import random
 import copy
@@ -16,7 +15,7 @@
 Test case infrastructure for MozZipFile.
 
 This isn't really a unit test, but a test case generator and runner.
-For a given set of files, lengths, and number of writes, we create 
+For a given set of files, lengths, and number of writes, we create
 a testcase for every combination of the three. There are some
 symmetries used to reduce the number of test cases, the first file
 written is always the first file, the second is either the first or