diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2017-10-23 16:51:11 +0200 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2017-10-24 10:05:36 +0200 |
| commit | 5449884b2ecd84f61287923aaffa867d07cbf026 (patch) | |
| tree | 290048d0cfaaa8347c2329e168e8f47875f651cd /var | |
| parent | b98fc48273b4e2a6f0ae776a5956a7593db65cc5 (diff) | |
| download | spack-5449884b2ecd84f61287923aaffa867d07cbf026.tar.gz spack-5449884b2ecd84f61287923aaffa867d07cbf026.tar.bz2 spack-5449884b2ecd84f61287923aaffa867d07cbf026.tar.xz spack-5449884b2ecd84f61287923aaffa867d07cbf026.zip | |
Fix bare 'except:' to placate errors in new flake8 version.
- fixes E722 errors from latest version of flake8
- requires us to not use 'bare except:' and catch BaseException instead
Diffstat (limited to 'var')
5 files changed, 6 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charm/package.py index 944b46889f..7358b5588e 100644 --- a/var/spack/repos/builtin/packages/charm/package.py +++ b/var/spack/repos/builtin/packages/charm/package.py @@ -177,6 +177,6 @@ class Charm(Package): shutil.copy2(filepath, tmppath) os.remove(filepath) os.rename(tmppath, filepath) - except: + except (IOError, OSError): pass shutil.rmtree(join_path(prefix, "tmp")) diff --git a/var/spack/repos/builtin/packages/hdf5-blosc/package.py b/var/spack/repos/builtin/packages/hdf5-blosc/package.py index a12fb14d6d..9a472db102 100644 --- a/var/spack/repos/builtin/packages/hdf5-blosc/package.py +++ b/var/spack/repos/builtin/packages/hdf5-blosc/package.py @@ -184,7 +184,7 @@ Done. try: check = Executable("./check") output = check(output=str) - except: + except ProcessError: output = "" success = output == expected if not success: diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index d499898a9d..fea0006d09 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -270,7 +270,7 @@ HDF5 version {version} {version} try: check = Executable('./check') output = check(output=str) - except: + except ProcessError: output = "" success = output == expected if not success: diff --git a/var/spack/repos/builtin/packages/plasma/package.py b/var/spack/repos/builtin/packages/plasma/package.py index ffe0254651..0e8f7918f0 100644 --- a/var/spack/repos/builtin/packages/plasma/package.py +++ b/var/spack/repos/builtin/packages/plasma/package.py @@ -63,7 +63,7 @@ class Plasma(MakefilePackage): for dep in ("blas", "lapack"): try: # in case the dependency does not provide header flags header_flags += " " + spec[dep].headers.cpp_flags - except: + except AttributeError: pass make_inc.filter("CFLAGS +[+]=", "CFLAGS += " + header_flags + " ") diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 15f2974328..b176169236 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -285,7 +285,7 @@ class Python(AutotoolsPackage): Python._DISTUTIL_CACHE_FILENAME) with open(output_filename, 'w') as output_file: sjson.dump(self._distutil_vars, output_file) - except: + except Exception: tty.warn("Failed to save metadata for distutils. This might " "cause the extensions that are installed with " "distutils to call compilers directly avoiding " @@ -308,7 +308,7 @@ class Python(AutotoolsPackage): if os.path.isfile(input_filename): with open(input_filename) as input_file: self._distutil_vars = sjson.load(input_file) - except: + except Exception: pass if not self._distutil_vars: |