From 038f9266a3031e47516e24e10037c3227791e267 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Thu, 25 May 2017 00:28:03 -0400 Subject: [PATCH] Do not use bare except: clauses https://docs.python.org/2/howto/doanddont.html#except Signed-off-by: Anders Kaseorg --- arrayfire/__init__.py | 2 +- arrayfire/array.py | 2 +- arrayfire/interop.py | 20 ++++++++++++-------- arrayfire/library.py | 10 +++++----- arrayfire/tests/simple/_util.py | 2 +- examples/benchmarks/bench_blas.py | 2 +- examples/benchmarks/bench_cg.py | 4 ++-- examples/benchmarks/bench_fft.py | 2 +- examples/benchmarks/monte_carlo_pi.py | 2 +- 9 files changed, 25 insertions(+), 21 deletions(-) diff --git a/arrayfire/__init__.py b/arrayfire/__init__.py index 255fbbeeb..538085bb3 100644 --- a/arrayfire/__init__.py +++ b/arrayfire/__init__.py @@ -50,7 +50,7 @@ try: import pycuda.autoinit -except: +except ImportError: pass from .library import * diff --git a/arrayfire/array.py b/arrayfire/array.py index beb7a0076..7c8ddd4f1 100644 --- a/arrayfire/array.py +++ b/arrayfire/array.py @@ -1310,7 +1310,7 @@ def display(a, precision=4): st = expr[0].find('(') + 1 en = expr[0].rfind(')') name = expr[0][st:en] - except: + except IndexError: pass safe_call(backend.get().af_print_array_gen(name.encode('utf-8'), diff --git a/arrayfire/interop.py b/arrayfire/interop.py index 0d400e64b..a93fbe5ae 100644 --- a/arrayfire/interop.py +++ b/arrayfire/interop.py @@ -75,6 +75,9 @@ def _cc_to_af_array(in_ptr, ndim, in_shape, in_dtype, is_device=False, copy = Tr try: import numpy as np +except ImportError: + AF_NUMPY_FOUND=False +else: from numpy import ndarray as NumpyArray from .data import reorder @@ -112,11 +115,12 @@ def np_to_af_array(np_arr, copy=True): return np_to_af_array(np_arr.copy()) from_ndarray = np_to_af_array -except: - AF_NUMPY_FOUND=False try: import pycuda.gpuarray +except ImportError: + AF_PYCUDA_FOUND=False +else: from pycuda.gpuarray import GPUArray as CudaArray AF_PYCUDA_FOUND=True @@ -154,11 +158,12 @@ def pycuda_to_af_array(pycu_arr, copy=True): return _cc_to_af_array(in_ptr, pycu_arr.ndim, in_shape, in_dtype, True, copy) else: return pycuda_to_af_array(pycu_arr.copy()) -except: - AF_PYCUDA_FOUND=False try: from pyopencl.array import Array as OpenclArray +except ImportError: + AF_PYOPENCL_FOUND=False +else: from .opencl import add_device_context as _add_device_context from .opencl import set_device_context as _set_device_context from .opencl import get_device_id as _get_device_id @@ -221,11 +226,12 @@ def pyopencl_to_af_array(pycl_arr, copy=True): return _cc_to_af_array(in_ptr, pycl_arr.ndim, in_shape, in_dtype, True, copy) else: return pyopencl_to_af_array(pycl_arr.copy()) -except: - AF_PYOPENCL_FOUND=False try: import numba +except ImportError: + AF_NUMBA_FOUND=False +else: from numba import cuda NumbaCudaArray = cuda.cudadrv.devicearray.DeviceNDArray AF_NUMBA_FOUND=True @@ -264,8 +270,6 @@ def numba_to_af_array(nb_arr, copy=True): return _cc_to_af_array(in_ptr, nb_arr.ndim, in_shape, in_dtype, True, copy) else: return numba_to_af_array(nb_arr.copy()) -except: - AF_NUMBA_FOUND=False def to_array(in_array, copy = True): """ diff --git a/arrayfire/library.py b/arrayfire/library.py index edaa62666..6c1108a34 100644 --- a/arrayfire/library.py +++ b/arrayfire/library.py @@ -47,7 +47,7 @@ from enum import Enum as _Enum def _Enum_Type(v): return v -except: +except ImportError: class _MetaEnum(type): def __init__(cls, name, bases, attrs): for attrname, attrvalue in attrs.iteritems(): @@ -417,7 +417,7 @@ def _setup(): try: AF_PATH = os.environ['AF_PATH'] - except: + except KeyError: AF_PATH = None pass @@ -425,7 +425,7 @@ def _setup(): try: CUDA_PATH = os.environ['CUDA_PATH'] - except: + except KeyError: CUDA_PATH= None pass @@ -534,7 +534,7 @@ def __init__(self): for libname in libnames: try: ct.cdll.LoadLibrary(libname) - except: + except OSError: pass c_dim4 = c_dim_t*4 @@ -555,7 +555,7 @@ def __init__(self): self.__name = __name clib.af_release_array(out) break; - except: + except OSError: pass if (self.__name is None): diff --git a/arrayfire/tests/simple/_util.py b/arrayfire/tests/simple/_util.py index 4b38e9c4d..cda7c84a8 100644 --- a/arrayfire/tests/simple/_util.py +++ b/arrayfire/tests/simple/_util.py @@ -24,7 +24,7 @@ def run(self, name_list=None, verbose=False): self.print_log = '' try: test = self[key] - except: + except KeyError: print(self.print_str % (key, "NOTFOUND")) continue diff --git a/examples/benchmarks/bench_blas.py b/examples/benchmarks/bench_blas.py index aaf4eb1de..21b776869 100644 --- a/examples/benchmarks/bench_blas.py +++ b/examples/benchmarks/bench_blas.py @@ -16,7 +16,7 @@ try: import numpy as np -except: +except ImportError: np = None diff --git a/examples/benchmarks/bench_cg.py b/examples/benchmarks/bench_cg.py index 2f0bb25d6..8a74f25a9 100644 --- a/examples/benchmarks/bench_cg.py +++ b/examples/benchmarks/bench_cg.py @@ -16,13 +16,13 @@ try: import numpy as np -except: +except ImportError: np = None try: from scipy import sparse as sp from scipy.sparse import linalg -except: +except ImportError: sp = None diff --git a/examples/benchmarks/bench_fft.py b/examples/benchmarks/bench_fft.py index 9a2d283ed..4d9a3d7b1 100644 --- a/examples/benchmarks/bench_fft.py +++ b/examples/benchmarks/bench_fft.py @@ -16,7 +16,7 @@ try: import numpy as np -except: +except ImportError: np = None diff --git a/examples/benchmarks/monte_carlo_pi.py b/examples/benchmarks/monte_carlo_pi.py index 2703069c2..440c01594 100755 --- a/examples/benchmarks/monte_carlo_pi.py +++ b/examples/benchmarks/monte_carlo_pi.py @@ -16,7 +16,7 @@ try: import numpy as np -except: +except ImportError: np = None #alias range / xrange because xrange is faster than range in python2