From de4b36f88138637132f428789187cde9fb499dd2 Mon Sep 17 00:00:00 2001
From: Taiju Tsuiki <tzik@users.noreply.github.com>
Date: Wed, 25 Oct 2017 07:13:04 +0900
Subject: Fix flake8 failures in scripts/ (#1239)
flake8 starts warning on bare "except:" in python scripts, and all CI job is failing for that.
---
scripts/test/shared.py | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
(limited to 'scripts/test/shared.py')
diff --git a/scripts/test/shared.py b/scripts/test/shared.py
index 915cd65e8..65f1f6e74 100644
--- a/scripts/test/shared.py
+++ b/scripts/test/shared.py
@@ -240,7 +240,7 @@ def setup_waterfall():
subprocess.check_call([CLANG, '-v'])
has_vanilla_llvm = True
print '...success'
- except Exception, e:
+ except (OSError, subprocess.CalledProcessError) as e:
warn('could not run vanilla LLVM from waterfall: ' + str(e) +
', looked for clang at ' + CLANG)
@@ -256,25 +256,31 @@ if options.only_prepare:
# external tools
try:
- subprocess.check_call(
- [NODEJS, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-except:
+ if NODEJS is not None:
+ subprocess.check_call(
+ [NODEJS, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+except (OSError, subprocess.CalledProcessError):
NODEJS = None
+if NODEJS is None:
warn('no node found (did not check proper js form)')
try:
- subprocess.check_call(
- [MOZJS, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-except:
+ if MOZJS is not None:
+ subprocess.check_call(
+ [MOZJS, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+except (OSError, subprocess.CalledProcessError):
MOZJS = None
+if MOZJS is None:
warn('no mozjs found (did not check native wasm support nor asm.js'
' validation)')
try:
- subprocess.check_call(
- [EMCC, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-except:
+ if EMCC is not None:
+ subprocess.check_call(
+ [EMCC, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+except (OSError, subprocess.CalledProcessError):
EMCC = None
+if EMCC is None:
warn('no emcc found (did not check non-vanilla emscripten/binaryen'
' integration)')
@@ -284,7 +290,7 @@ try:
[os.path.join(options.binaryen_test, 'emscripten', 'emcc'), '--version'],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
has_vanilla_emcc = True
-except:
+except (OSError, subprocess.CalledProcessError):
pass
@@ -294,13 +300,13 @@ except:
def delete_from_orbit(filename):
try:
os.unlink(filename)
- except:
+ except OSError:
pass
if not os.path.exists(filename):
return
try:
shutil.rmtree(filename, ignore_errors=True)
- except:
+ except OSError:
pass
if not os.path.exists(filename):
return
@@ -315,7 +321,7 @@ def delete_from_orbit(filename):
else:
raise
shutil.rmtree(filename, onerror=remove_readonly_and_try_again)
- except:
+ except OSError:
pass
--
cgit v1.2.3