Fixed #25682 -- Removed bare except clauses.

3 files changed, 5 insertions, 4 deletions

diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py
index 2f4cc88d12..0da6126c01 100644
--- a/tests/admin_views/admin.py
+++ b/tests/admin_views/admin.py
@@ -593,9 +593,10 @@ class PluggableSearchPersonAdmin(admin.ModelAdmin):
         )
         try:
             search_term_as_int = int(search_term)
-            queryset |= self.model.objects.filter(age=search_term_as_int)
-        except:
+        except ValueError:
             pass
+        else:
+            queryset |= self.model.objects.filter(age=search_term_as_int)
         return queryset, use_distinct
 
 
diff --git a/tests/gis_tests/inspectapp/tests.py b/tests/gis_tests/inspectapp/tests.py
index c272b65aa8..1e774218a2 100644
--- a/tests/gis_tests/inspectapp/tests.py
+++ b/tests/gis_tests/inspectapp/tests.py
@@ -181,7 +181,7 @@ def get_ogr_db_string():
     # Ensure that GDAL library has driver support for the database.
     try:
         Driver(drv_name)
-    except:
+    except GDALException:
         return None
 
     # SQLite/Spatialite in-memory databases
diff --git a/tests/test_client_regress/session.py b/tests/test_client_regress/session.py
index 47c192718b..461f66b624 100644
--- a/tests/test_client_regress/session.py
+++ b/tests/test_client_regress/session.py
@@ -26,6 +26,6 @@ class SessionStore(SessionBase):
     def load(self):
         try:
             return self.decode(self.session_key)
-        except:
+        except Exception:
             self.modified = True
             return {}