tools: python: update flake8 rules

* Tree-factor location of some *.py files for easy demarcation of areas to exclude. PR-URL: #25614 Reviewed-By: Sakthipriyan Vairamani <[email protected]>
nodejs · Apr 14, 2019 · 0befda6 · 0befda6
1 parent 914d6c9
commit 0befda6
Show file tree

Hide file tree

Showing 57 changed files with 9 additions and 13 deletions.
diff --git a/.flake8 b/.flake8
@@ -1,3 +1,3 @@
 [flake8]
-exclude=.git,deps,lib,src,test/fixtures,tools/*_macros.py,tools/gyp,tools/inspector_protocol,tools/jinja2,tools/markupsafe,tools/pip,tools/v8_gypfiles/broken
-select=E901,E999,F821,F822,F823
+exclude=.git,deps,lib,src,tools/gyp,tools/inspector_protocol,tools/pip,tools/v8_gypfiles/broken
+select=E9,F82
diff --git a/node.gyp b/node.gyp
@@ -805,20 +805,20 @@
           'inputs': [
             '<@(library_files)',
             'config.gypi',
-            'tools/check_macros.py'
+            'tools/js2c_macros/check_macros.py'
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc',
           ],
           'conditions': [
             [ 'node_use_dtrace=="false" and node_use_etw=="false"', {
-              'inputs': [ 'src/notrace_macros.py' ]
+              'inputs': [ 'tools/js2c_macros/notrace_macros.py' ]
             }],
             [ 'node_debug_lib=="false"', {
-              'inputs': [ 'tools/nodcheck_macros.py' ]
+              'inputs': [ 'tools/js2c_macros/nodcheck_macros.py' ]
             }],
             [ 'node_debug_lib=="true"', {
-              'inputs': [ 'tools/dcheck_macros.py' ]
+              'inputs': [ 'tools/js2c_macros/dcheck_macros.py' ]
             }]
           ],
           'action': [

diff --git a/src/inspector/node_inspector.gypi b/src/inspector/node_inspector.gypi
@@ -97,7 +97,7 @@
       'action': [
         'python',
         'tools/inspector_protocol/code_generator.py',
-        '--jinja_dir', '<@(protocol_tool_path)/..',
+        '--jinja_dir', '<@(protocol_tool_path)',
         '--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/',
         '--config', 'src/inspector/node_protocol_config.json',
       ],

diff --git a/test/fixtures/wpt/.gitignore b/test/fixtures/wpt/.gitignore
@@ -0,0 +1 @@
+*.py
diff --git a/test/fixtures/wpt/encoding/resources/single-byte-raw.py b/test/fixtures/wpt/encoding/resources/single-byte-raw.py
diff --git a/test/fixtures/wpt/encoding/resources/text-plain-charset.py b/test/fixtures/wpt/encoding/resources/text-plain-charset.py
diff --git a/tools/jinja2/AUTHORS → tools/inspector_protocol/jinja2/AUTHORS b/tools/jinja2/AUTHORS → tools/inspector_protocol/jinja2/AUTHORS
diff --git a/tools/jinja2/Jinja2-2.10.tar.gz.md5 → ...or_protocol/jinja2/Jinja2-2.10.tar.gz.md5 b/tools/jinja2/Jinja2-2.10.tar.gz.md5 → ...or_protocol/jinja2/Jinja2-2.10.tar.gz.md5
diff --git a/tools/jinja2/Jinja2-2.10.tar.gz.sha512 → ...protocol/jinja2/Jinja2-2.10.tar.gz.sha512 b/tools/jinja2/Jinja2-2.10.tar.gz.sha512 → ...protocol/jinja2/Jinja2-2.10.tar.gz.sha512
diff --git a/tools/jinja2/LICENSE → tools/inspector_protocol/jinja2/LICENSE b/tools/jinja2/LICENSE → tools/inspector_protocol/jinja2/LICENSE
diff --git a/tools/jinja2/OWNERS → tools/inspector_protocol/jinja2/OWNERS b/tools/jinja2/OWNERS → tools/inspector_protocol/jinja2/OWNERS
diff --git a/tools/jinja2/README.chromium → ...inspector_protocol/jinja2/README.chromium b/tools/jinja2/README.chromium → ...inspector_protocol/jinja2/README.chromium
diff --git a/tools/jinja2/__init__.py → tools/inspector_protocol/jinja2/__init__.py b/tools/jinja2/__init__.py → tools/inspector_protocol/jinja2/__init__.py
diff --git a/tools/jinja2/_compat.py → tools/inspector_protocol/jinja2/_compat.py b/tools/jinja2/_compat.py → tools/inspector_protocol/jinja2/_compat.py
diff --git a/tools/jinja2/_identifier.py → .../inspector_protocol/jinja2/_identifier.py b/tools/jinja2/_identifier.py → .../inspector_protocol/jinja2/_identifier.py
diff --git a/tools/jinja2/asyncfilters.py → ...inspector_protocol/jinja2/asyncfilters.py b/tools/jinja2/asyncfilters.py → ...inspector_protocol/jinja2/asyncfilters.py
diff --git a/tools/jinja2/asyncsupport.py → ...inspector_protocol/jinja2/asyncsupport.py b/tools/jinja2/asyncsupport.py → ...inspector_protocol/jinja2/asyncsupport.py
diff --git a/tools/jinja2/bccache.py → tools/inspector_protocol/jinja2/bccache.py b/tools/jinja2/bccache.py → tools/inspector_protocol/jinja2/bccache.py
diff --git a/tools/jinja2/compiler.py → tools/inspector_protocol/jinja2/compiler.py b/tools/jinja2/compiler.py → tools/inspector_protocol/jinja2/compiler.py
diff --git a/tools/jinja2/constants.py → tools/inspector_protocol/jinja2/constants.py b/tools/jinja2/constants.py → tools/inspector_protocol/jinja2/constants.py
diff --git a/tools/jinja2/debug.py → tools/inspector_protocol/jinja2/debug.py b/tools/jinja2/debug.py → tools/inspector_protocol/jinja2/debug.py
diff --git a/tools/jinja2/defaults.py → tools/inspector_protocol/jinja2/defaults.py b/tools/jinja2/defaults.py → tools/inspector_protocol/jinja2/defaults.py
diff --git a/tools/jinja2/environment.py → .../inspector_protocol/jinja2/environment.py b/tools/jinja2/environment.py → .../inspector_protocol/jinja2/environment.py
diff --git a/tools/jinja2/exceptions.py → ...s/inspector_protocol/jinja2/exceptions.py b/tools/jinja2/exceptions.py → ...s/inspector_protocol/jinja2/exceptions.py
diff --git a/tools/jinja2/ext.py → tools/inspector_protocol/jinja2/ext.py b/tools/jinja2/ext.py → tools/inspector_protocol/jinja2/ext.py
diff --git a/tools/jinja2/filters.py → tools/inspector_protocol/jinja2/filters.py b/tools/jinja2/filters.py → tools/inspector_protocol/jinja2/filters.py
diff --git a/tools/jinja2/get_jinja2.sh → ...s/inspector_protocol/jinja2/get_jinja2.sh b/tools/jinja2/get_jinja2.sh → ...s/inspector_protocol/jinja2/get_jinja2.sh
diff --git a/tools/jinja2/idtracking.py → ...s/inspector_protocol/jinja2/idtracking.py b/tools/jinja2/idtracking.py → ...s/inspector_protocol/jinja2/idtracking.py
diff --git a/tools/jinja2/jinja2.gni → tools/inspector_protocol/jinja2/jinja2.gni b/tools/jinja2/jinja2.gni → tools/inspector_protocol/jinja2/jinja2.gni
diff --git a/tools/jinja2/lexer.py → tools/inspector_protocol/jinja2/lexer.py b/tools/jinja2/lexer.py → tools/inspector_protocol/jinja2/lexer.py
diff --git a/tools/jinja2/loaders.py → tools/inspector_protocol/jinja2/loaders.py b/tools/jinja2/loaders.py → tools/inspector_protocol/jinja2/loaders.py
diff --git a/tools/jinja2/meta.py → tools/inspector_protocol/jinja2/meta.py b/tools/jinja2/meta.py → tools/inspector_protocol/jinja2/meta.py
diff --git a/tools/jinja2/nativetypes.py → .../inspector_protocol/jinja2/nativetypes.py b/tools/jinja2/nativetypes.py → .../inspector_protocol/jinja2/nativetypes.py
diff --git a/tools/jinja2/nodes.py → tools/inspector_protocol/jinja2/nodes.py b/tools/jinja2/nodes.py → tools/inspector_protocol/jinja2/nodes.py
diff --git a/tools/jinja2/optimizer.py → tools/inspector_protocol/jinja2/optimizer.py b/tools/jinja2/optimizer.py → tools/inspector_protocol/jinja2/optimizer.py
diff --git a/tools/jinja2/parser.py → tools/inspector_protocol/jinja2/parser.py b/tools/jinja2/parser.py → tools/inspector_protocol/jinja2/parser.py
diff --git a/tools/jinja2/runtime.py → tools/inspector_protocol/jinja2/runtime.py b/tools/jinja2/runtime.py → tools/inspector_protocol/jinja2/runtime.py
diff --git a/tools/jinja2/sandbox.py → tools/inspector_protocol/jinja2/sandbox.py b/tools/jinja2/sandbox.py → tools/inspector_protocol/jinja2/sandbox.py
diff --git a/tools/jinja2/tests.py → tools/inspector_protocol/jinja2/tests.py b/tools/jinja2/tests.py → tools/inspector_protocol/jinja2/tests.py
diff --git a/tools/jinja2/utils.py → tools/inspector_protocol/jinja2/utils.py b/tools/jinja2/utils.py → tools/inspector_protocol/jinja2/utils.py
diff --git a/tools/jinja2/visitor.py → tools/inspector_protocol/jinja2/visitor.py b/tools/jinja2/visitor.py → tools/inspector_protocol/jinja2/visitor.py
diff --git a/tools/markupsafe/AUTHORS → tools/inspector_protocol/markupsafe/AUTHORS b/tools/markupsafe/AUTHORS → tools/inspector_protocol/markupsafe/AUTHORS
diff --git a/tools/markupsafe/LICENSE → tools/inspector_protocol/markupsafe/LICENSE b/tools/markupsafe/LICENSE → tools/inspector_protocol/markupsafe/LICENSE
diff --git a/tools/markupsafe/MarkupSafe-0.18.tar.gz.md5 → ...col/markupsafe/MarkupSafe-0.18.tar.gz.md5 b/tools/markupsafe/MarkupSafe-0.18.tar.gz.md5 → ...col/markupsafe/MarkupSafe-0.18.tar.gz.md5
diff --git a/.../markupsafe/MarkupSafe-0.18.tar.gz.sha512 → .../markupsafe/MarkupSafe-0.18.tar.gz.sha512 b/.../markupsafe/MarkupSafe-0.18.tar.gz.sha512 → .../markupsafe/MarkupSafe-0.18.tar.gz.sha512
diff --git a/tools/markupsafe/OWNERS → tools/inspector_protocol/markupsafe/OWNERS b/tools/markupsafe/OWNERS → tools/inspector_protocol/markupsafe/OWNERS
diff --git a/tools/markupsafe/README.chromium → ...ector_protocol/markupsafe/README.chromium b/tools/markupsafe/README.chromium → ...ector_protocol/markupsafe/README.chromium
diff --git a/tools/markupsafe/__init__.py → ...inspector_protocol/markupsafe/__init__.py b/tools/markupsafe/__init__.py → ...inspector_protocol/markupsafe/__init__.py
diff --git a/tools/markupsafe/_compat.py → .../inspector_protocol/markupsafe/_compat.py b/tools/markupsafe/_compat.py → .../inspector_protocol/markupsafe/_compat.py
diff --git a/tools/markupsafe/_constants.py → ...spector_protocol/markupsafe/_constants.py b/tools/markupsafe/_constants.py → ...spector_protocol/markupsafe/_constants.py
diff --git a/tools/markupsafe/_native.py → .../inspector_protocol/markupsafe/_native.py b/tools/markupsafe/_native.py → .../inspector_protocol/markupsafe/_native.py
diff --git a/tools/markupsafe/_speedups.c → ...inspector_protocol/markupsafe/_speedups.c b/tools/markupsafe/_speedups.c → ...inspector_protocol/markupsafe/_speedups.c
diff --git a/tools/markupsafe/get_markupsafe.sh → ...tor_protocol/markupsafe/get_markupsafe.sh b/tools/markupsafe/get_markupsafe.sh → ...tor_protocol/markupsafe/get_markupsafe.sh
diff --git a/tools/check_macros.py → tools/js2c_macros/check_macros.py b/tools/check_macros.py → tools/js2c_macros/check_macros.py
@@ -1,3 +1,4 @@
+# flake8: noqa
 macro CHECK(x) = do { if (!(x)) (process._rawDebug("CHECK: x == true"), process.abort()) } while (0);
 macro CHECK_EQ(a, b) = CHECK((a) === (b));
 macro CHECK_GE(a, b) = CHECK((a) >= (b));

diff --git a/tools/dcheck_macros.py → tools/js2c_macros/dcheck_macros.py b/tools/dcheck_macros.py → tools/js2c_macros/dcheck_macros.py
diff --git a/tools/nodcheck_macros.py → tools/js2c_macros/nodcheck_macros.py b/tools/nodcheck_macros.py → tools/js2c_macros/nodcheck_macros.py
diff --git a/src/notrace_macros.py → tools/js2c_macros/notrace_macros.py b/src/notrace_macros.py → tools/js2c_macros/notrace_macros.py