Merge pull request #22387 from charris/backport-22356

charris · web-flow · commit a35df7cc5d64 · 2022-10-05T21:10:37.000-05:00
REV: Loosen ``lookfor``'s import try/except again
diff --git a/numpy/lib/utils.py b/numpy/lib/utils.py
@@ -907,8 +907,12 @@ def _lookfor_generate_cache(module, import_modules, regenerate):
                             finally:
                                 sys.stdout = old_stdout
                                 sys.stderr = old_stderr
-                        # Catch SystemExit, too
-                        except (Exception, SystemExit):
+                        except KeyboardInterrupt:
+                            # Assume keyboard interrupt came from a user
+                            raise
+                        except BaseException:
+                            # Ignore also SystemExit and pytests.importorskip
+                            # `Skipped` (these are BaseExceptions; gh-22345)
                             continue
 
             for n, v in _getmembers(item):
