Commit 15fffcc7 authored by Claude Paroz's avatar Claude Paroz
Browse files

[py3] Fixed reraising of exceptions 

reraise with second argument to None is not supported.
parent be7f1099

django/core/handlers/base.py

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ class BaseHandler(object): 


        # If Http500 handler is not installed, re-raise last exception

        if resolver.urlconf_module is None:

            six.reraise(exc_info[1], None, exc_info[2])

            six.reraise(*exc_info)

        # Return an HttpResponse that displays a friendly error message.

        callback, param_dict = resolver.resolve500()

        return callback(request, **param_dict)

django/db/models/query.py

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ class QuerySet(object): 
                    return self.get(**lookup), False

                except self.model.DoesNotExist:

                    # Re-raise the IntegrityError with its original traceback.

                    six.reraise(exc_info[1], None, exc_info[2])

                    six.reraise(*exc_info)



    def latest(self, field_name=None):

        """

django/test/client.py

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ class Client(RequestFactory): 
            if self.exc_info:

                exc_info = self.exc_info

                self.exc_info = None

                six.reraise(exc_info[1], None, exc_info[2])

                six.reraise(*exc_info)



            # Save the client and request that stimulated the response.

            response.client = self