diff options
author | Eric Wieser <wieser.eric@gmail.com> | 2017-06-03 13:41:26 +0100 |
---|---|---|
committer | Eric Wieser <wieser.eric@gmail.com> | 2017-06-03 13:59:51 +0100 |
commit | 1608e53072b035bd40de7a202e75354f0e802120 (patch) | |
tree | a530210ff9fa4f44e1e3061af05df3f55ec96c35 /numpy/testing/utils.py | |
parent | 0e4610e30aabaf32c037fc94c869a20f2435a8f1 (diff) | |
download | numpy-1608e53072b035bd40de7a202e75354f0e802120.tar.gz |
BUG: KeyboardInterrupt is swallowed all over the place
Bare except is very rarely the right thing
Diffstat (limited to 'numpy/testing/utils.py')
-rw-r--r-- | numpy/testing/utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/testing/utils.py b/numpy/testing/utils.py index f54995870..88034322d 100644 --- a/numpy/testing/utils.py +++ b/numpy/testing/utils.py @@ -210,7 +210,7 @@ elif sys.platform[:5] == 'linux': l = f.readline().split(' ') f.close() return int(l[22]) - except: + except Exception: return else: def memusage(): @@ -239,7 +239,7 @@ if sys.platform[:5] == 'linux': l = f.readline().split(' ') f.close() return int(l[13]) - except: + except Exception: return int(100*(time.time()-_load_time[0])) else: # os.getpid is not in all platforms available. |