Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[py3] Fixed reraising of exceptions

reraise with second argument to None is not supported.
  • Loading branch information...
commit 15fffcc7510ec2bf0fafdc254206619a8ab0923f 1 parent be7f109
@claudep claudep authored
View
2  django/core/handlers/base.py
@@ -225,7 +225,7 @@ def handle_uncaught_exception(self, request, resolver, exc_info):
# 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)
View
2  django/db/models/query.py
@@ -472,7 +472,7 @@ def get_or_create(self, **kwargs):
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):
"""
View
2  django/test/client.py
@@ -385,7 +385,7 @@ def request(self, **request):
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
Please sign in to comment.
Something went wrong with that request. Please try again.