python: Catch BaseException when we need to clean something up.

Signed-off-by: Anders Kaseorg <anders@zulip.com>

scripts/lib/zulip_tools.py

@@ -53,7 +53,7 @@ def overwrite_symlink(src: str, dst: str) -> None:
         break
     try:
         os.rename(tmp, dst)
-    except Exception:
+    except BaseException:
         os.remove(tmp)
         raise
 

zerver/lib/queue.py

@@ -167,7 +167,7 @@ class SimpleQueueClient:
                         try:
                             callback(events)
                             channel.basic_ack(max_processed, multiple=True)
-                        except Exception:
+                        except BaseException:
                             channel.basic_nack(max_processed, multiple=True)
                             raise
                         events = []

zerver/management/commands/export_usermessage_batch.py

@@ -35,7 +35,7 @@ class Command(BaseCommand):
             logging.info("Thread %s processing %s", options['thread'], output_path)
             try:
                 export_usermessages_batch(locked_path, output_path, options["consent_message_id"])
-            except Exception:
+            except BaseException:
                 # Put the item back in the free pool when we fail
                 os.rename(locked_path, partial_path)
                 raise