mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 01:25:32 +00:00
Code Issues 32 Releases Wiki Activity

[py3] Fixed reraising of exceptions

Browse Source 
reraise with second argument to None is not supported.
This commit is contained in:
Claude Paroz
2012-08-11 23:43:45 +02:00
parent be7f1099c6
commit 15fffcc751
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/handlers/base.py
View File

@@ -225,7 +225,7 @@ class BaseHandler(object):
# If Http500 handler is not installed, re-raise last exception # If Http500 handler is not installed, re-raise last exception
if resolver.urlconf_module is None: 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. # Return an HttpResponse that displays a friendly error message.
callback, param_dict = resolver.resolve500() callback, param_dict = resolver.resolve500()
return callback(request, **param_dict) return callback(request, **param_dict)

2
django/db/models/query.py
View File

@@ -472,7 +472,7 @@ class QuerySet(object):
return self.get(**lookup), False return self.get(**lookup), False
except self.model.DoesNotExist: except self.model.DoesNotExist:
# Re-raise the IntegrityError with its original traceback. # 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): def latest(self, field_name=None):
""" """

2
django/test/client.py
View File

@@ -385,7 +385,7 @@ class Client(RequestFactory):
if self.exc_info: if self.exc_info:
exc_info = self.exc_info exc_info = self.exc_info
self.exc_info = None 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. # Save the client and request that stimulated the response.
response.client = self response.client = self