Don't silently swallow exceptions in python context managers

Notably this causes processing modules to silently fail to load without any warnings if the required dependancies (such as pyscopg2) are not installed (cherry picked from commit 1040fe8)
qgis · Mar 19, 2021 · e2f1a82 · e2f1a82
1 parent 67a9ff6
commit e2f1a82
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/python/core/additions/projectdirtyblocker.py b/python/core/additions/projectdirtyblocker.py
@@ -44,4 +44,4 @@ def __enter__(self):
 
     def __exit__(self, ex_type, ex_value, traceback):
         del self.blocker
-        return True
+        return ex_type is None
diff --git a/python/core/additions/readwritecontextentercategory.py b/python/core/additions/readwritecontextentercategory.py
@@ -43,4 +43,4 @@ def __enter__(self):
 
     def __exit__(self, ex_type, ex_value, traceback):
         del self.popper
-        return True
+        return ex_type is None
diff --git a/python/core/additions/runtimeprofiler.py b/python/core/additions/runtimeprofiler.py
@@ -43,4 +43,4 @@ def __enter__(self):
 
     def __exit__(self, ex_type, ex_value, traceback):
         del self.profiler
-        return True
+        return ex_type is None
diff --git a/python/plugins/db_manager/db_plugins/vlayers/connector.py b/python/plugins/db_manager/db_plugins/vlayers/connector.py
@@ -45,8 +45,9 @@ def __init__(self, sqlite_file):
     def __enter__(self):
         return self.conn
 
-    def __exit__(self, type, value, traceback):
+    def __exit__(self, ex_type, value, traceback):
         self.conn.close()
+        return ex_type is None
 
 
 def getQueryGeometryName(sqlite_file):

diff --git a/python/utils.py b/python/utils.py
@@ -710,6 +710,7 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         QApplication.restoreOverrideCursor()
+        return exc_type is None
 
 
 #######################