diff options
| author | Claude Paroz <claude@2xlibre.net> | 2012-08-11 23:43:45 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2012-08-11 23:46:23 +0200 |
| commit | 15fffcc7510ec2bf0fafdc254206619a8ab0923f (patch) | |
| tree | c75781b0c4d0819b49333fc9e005ec7832f65a79 | |
| parent | be7f1099c61004bda8c491fc4e7aab9f8b2c8512 (diff) | |
[py3] Fixed reraising of exceptions
reraise with second argument to None is not supported.
| -rw-r--r-- | django/core/handlers/base.py | 2 | ||||
| -rw-r--r-- | django/db/models/query.py | 2 | ||||
| -rw-r--r-- | django/test/client.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py index 5a6825f0a7..745b6ca3ad 100644 --- a/django/core/handlers/base.py +++ b/django/core/handlers/base.py @@ -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) diff --git a/django/db/models/query.py b/django/db/models/query.py index e8d6ae2a7b..3cf794924c 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -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): """ diff --git a/django/test/client.py b/django/test/client.py index a9ae7f5db1..771f7e0da5 100644 --- a/django/test/client.py +++ b/django/test/client.py @@ -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 |
