Fixed #25682 -- Removed bare except clauses.

8 files changed, 12 insertions, 11 deletions

diff --git a/django/contrib/gis/utils/layermapping.py b/django/contrib/gis/utils/layermapping.py
index fcc4537cb9..665d2e3cc6 100644
--- a/django/contrib/gis/utils/layermapping.py
+++ b/django/contrib/gis/utils/layermapping.py
@@ -619,7 +619,7 @@ class LayerMapping(object):
                 try:
                     num_feat, num_saved = _save(step_slice, num_feat, num_saved)
                     beg = end
-                except:  # Deliberately catch everything
+                except Exception:  # Deliberately catch everything
                     stream.write('%s\nFailed to save slice: %s\n' % ('=-' * 20, step_slice))
                     raise
         else:
diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py
index ca163f7232..55aec8fc9b 100644
--- a/django/core/handlers/base.py
+++ b/django/core/handlers/base.py
@@ -97,7 +97,7 @@ class BaseHandler(object):
                     RemovedInDjango20Warning, stacklevel=2
                 )
                 response = callback(request, **param_dict)
-        except:
+        except Exception:
             signals.got_request_exception.send(sender=self.__class__, request=request)
             response = self.handle_uncaught_exception(request, resolver, sys.exc_info())
 
@@ -224,7 +224,7 @@ class BaseHandler(object):
             # Allow sys.exit() to actually exit. See tickets #1023 and #4701
             raise
 
-        except:  # Handle everything else.
+        except Exception:  # Handle everything else.
             # Get the exception info now, in case another exception is thrown later.
             signals.got_request_exception.send(sender=self.__class__, request=request)
             response = self.handle_uncaught_exception(request, resolver, sys.exc_info())
@@ -240,7 +240,7 @@ class BaseHandler(object):
                         "HttpResponse object. It returned None instead."
                         % (middleware_method.__self__.__class__.__name__))
             response = self.apply_response_fixes(request, response)
-        except:  # Any exception should be gathered and handled
+        except Exception:  # Any exception should be gathered and handled
             signals.got_request_exception.send(sender=self.__class__, request=request)
             response = self.handle_uncaught_exception(request, resolver, sys.exc_info())
 
diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py
index cd3dfb2305..60e68a005c 100644
--- a/django/core/handlers/wsgi.py
+++ b/django/core/handlers/wsgi.py
@@ -159,7 +159,7 @@ class WSGIHandler(base.BaseHandler):
                     # Check that middleware is still uninitialized.
                     if self._request_middleware is None:
                         self.load_middleware()
-                except:
+                except Exception:
                     # Unload whatever middleware we got
                     self._request_middleware = None
                     raise
diff --git a/django/template/loaders/eggs.py b/django/template/loaders/eggs.py
index 04fa239c86..90dfe685f0 100644
--- a/django/template/loaders/eggs.py
+++ b/django/template/loaders/eggs.py
@@ -36,7 +36,7 @@ class Loader(BaseLoader):
     def get_contents(self, origin):
         try:
             source = resource_string(origin.app_name, origin.pkg_name)
-        except:
+        except Exception:
             raise TemplateDoesNotExist(origin)
 
         if six.PY2:
diff --git a/django/utils/module_loading.py b/django/utils/module_loading.py
index 4a2c500321..9dcbc926b9 100644
--- a/django/utils/module_loading.py
+++ b/django/utils/module_loading.py
@@ -48,7 +48,7 @@ def autodiscover_modules(*args, **kwargs):
                     before_import_registry = copy.copy(register_to._registry)
 
                 import_module('%s.%s' % (app_config.name, module_to_search))
-            except:
+            except Exception:
                 # Reset the registry to the state before the last import
                 # as this import will have to reoccur on the next request and
                 # this could raise NotRegistered and AlreadyRegistered
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 {}