Kaydet (Commit) 1b100d7b authored tarafından Aymeric Augustin's avatar Aymeric Augustin

Fixed two bugs in 59a35208.

* StandardError doesn't exist any more under Python 3.
* Python 2.6 still allows `raise "foo"`.
üst 59a35208
......@@ -14,7 +14,7 @@ from django.utils import six
DEFAULT_DB_ALIAS = 'default'
class Error(StandardError):
class Error(Exception if six.PY3 else StandardError):
pass
......@@ -81,7 +81,12 @@ class DatabaseErrorWrapper(object):
):
db_exc_type = getattr(self.database, dj_exc_type.__name__)
if issubclass(exc_type, db_exc_type):
dj_exc_value = dj_exc_type(*tuple(exc_value.args))
# Under Python 2.6, exc_value can still be a string.
try:
args = tuple(exc_value.args)
except AttributeError:
args = (exc_value,)
dj_exc_value = dj_exc_type(*args)
if six.PY3:
dj_exc_value.__cause__ = exc_value
six.reraise(dj_exc_type, dj_exc_value, traceback)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment