diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2016-12-09 21:55:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-09 21:55:09 -0500 |
| commit | e00b9587052248486a9bf66c2ce95638c0d9817f (patch) | |
| tree | 4f91c94f802aa32624c03e7e4e4d72697d547324 /numpy/lib/utils.py | |
| parent | 071f07030a4a05dc3b5bee4240d746ce39bae89b (diff) | |
| parent | 7758aca6ae4c512165e3e7bc81a1d4b01649d4f4 (diff) | |
| download | numpy-e00b9587052248486a9bf66c2ce95638c0d9817f.tar.gz | |
Merge pull request #8360 from shadchin/drop_old_python
Drop old python
Diffstat (limited to 'numpy/lib/utils.py')
| -rw-r--r-- | numpy/lib/utils.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/numpy/lib/utils.py b/numpy/lib/utils.py index 97b93cace..5c364268c 100644 --- a/numpy/lib/utils.py +++ b/numpy/lib/utils.py @@ -917,13 +917,6 @@ def _lookfor_generate_cache(module, import_modules, regenerate): continue try: - # Catch SystemExit, too - base_exc = BaseException - except NameError: - # Python 2.4 doesn't have BaseException - base_exc = Exception - - try: old_stdout = sys.stdout old_stderr = sys.stderr try: @@ -933,7 +926,8 @@ def _lookfor_generate_cache(module, import_modules, regenerate): finally: sys.stdout = old_stdout sys.stderr = old_stderr - except base_exc: + # Catch SystemExit, too + except BaseException: continue for n, v in _getmembers(item): |