Commit 0a2d3b73 authored by Attila Tovt's avatar Attila Tovt Committed by Tim Graham
Browse files

Fixed #25682 -- Removed bare except clauses.

parent 16945f0e

django/contrib/gis/utils/layermapping.py

+1 −1
Original line number Diff line number Diff line
@@ -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:

django/core/handlers/base.py

+3 −3
Original line number Diff line number Diff line
@@ -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())

django/core/handlers/wsgi.py

+1 −1
Original line number Diff line number Diff line
@@ -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

django/template/loaders/eggs.py

+1 −1
Original line number Diff line number Diff line
@@ -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:

django/utils/module_loading.py

+1 −1
Original line number Diff line number Diff line
@@ -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