mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-06 21:11:57 +00:00
Remove exception_to_unicode
this is a no-op on python 3.
This commit is contained in:
parent
572b444dab
commit
08fa96f030
@ -50,7 +50,6 @@ from synapse.storage.background_updates import BackgroundUpdater
|
|||||||
from synapse.storage.engines import BaseDatabaseEngine, PostgresEngine, Sqlite3Engine
|
from synapse.storage.engines import BaseDatabaseEngine, PostgresEngine, Sqlite3Engine
|
||||||
from synapse.storage.types import Connection, Cursor
|
from synapse.storage.types import Connection, Cursor
|
||||||
from synapse.types import Collection
|
from synapse.types import Collection
|
||||||
from synapse.util.stringutils import exception_to_unicode
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -424,20 +423,14 @@ class Database(object):
|
|||||||
# This can happen if the database disappears mid
|
# This can happen if the database disappears mid
|
||||||
# transaction.
|
# transaction.
|
||||||
logger.warning(
|
logger.warning(
|
||||||
"[TXN OPERROR] {%s} %s %d/%d",
|
"[TXN OPERROR] {%s} %s %d/%d", name, e, i, N,
|
||||||
name,
|
|
||||||
exception_to_unicode(e),
|
|
||||||
i,
|
|
||||||
N,
|
|
||||||
)
|
)
|
||||||
if i < N:
|
if i < N:
|
||||||
i += 1
|
i += 1
|
||||||
try:
|
try:
|
||||||
conn.rollback()
|
conn.rollback()
|
||||||
except self.engine.module.Error as e1:
|
except self.engine.module.Error as e1:
|
||||||
logger.warning(
|
logger.warning("[TXN EROLL] {%s} %s", name, e1)
|
||||||
"[TXN EROLL] {%s} %s", name, exception_to_unicode(e1)
|
|
||||||
)
|
|
||||||
continue
|
continue
|
||||||
raise
|
raise
|
||||||
except self.engine.module.DatabaseError as e:
|
except self.engine.module.DatabaseError as e:
|
||||||
@ -449,9 +442,7 @@ class Database(object):
|
|||||||
conn.rollback()
|
conn.rollback()
|
||||||
except self.engine.module.Error as e1:
|
except self.engine.module.Error as e1:
|
||||||
logger.warning(
|
logger.warning(
|
||||||
"[TXN EROLL] {%s} %s",
|
"[TXN EROLL] {%s} %s", name, e1,
|
||||||
name,
|
|
||||||
exception_to_unicode(e1),
|
|
||||||
)
|
)
|
||||||
continue
|
continue
|
||||||
raise
|
raise
|
||||||
|
@ -85,42 +85,6 @@ def to_ascii(s):
|
|||||||
return s
|
return s
|
||||||
|
|
||||||
|
|
||||||
def exception_to_unicode(e):
|
|
||||||
"""Helper function to extract the text of an exception as a unicode string
|
|
||||||
|
|
||||||
Args:
|
|
||||||
e (Exception): exception to be stringified
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
unicode
|
|
||||||
"""
|
|
||||||
# urgh, this is a mess. The basic problem here is that psycopg2 constructs its
|
|
||||||
# exceptions with PyErr_SetString, with a (possibly non-ascii) argument. str() will
|
|
||||||
# then produce the raw byte sequence. Under Python 2, this will then cause another
|
|
||||||
# error if it gets mixed with a `unicode` object, as per
|
|
||||||
# https://github.com/matrix-org/synapse/issues/4252
|
|
||||||
|
|
||||||
# First of all, if we're under python3, everything is fine because it will sort this
|
|
||||||
# nonsense out for us.
|
|
||||||
if not PY2:
|
|
||||||
return str(e)
|
|
||||||
|
|
||||||
# otherwise let's have a stab at decoding the exception message. We'll circumvent
|
|
||||||
# Exception.__str__(), which would explode if someone raised Exception(u'non-ascii')
|
|
||||||
# and instead look at what is in the args member.
|
|
||||||
|
|
||||||
if len(e.args) == 0:
|
|
||||||
return ""
|
|
||||||
elif len(e.args) > 1:
|
|
||||||
return six.text_type(repr(e.args))
|
|
||||||
|
|
||||||
msg = e.args[0]
|
|
||||||
if isinstance(msg, bytes):
|
|
||||||
return msg.decode("utf-8", errors="replace")
|
|
||||||
else:
|
|
||||||
return msg
|
|
||||||
|
|
||||||
|
|
||||||
def assert_valid_client_secret(client_secret):
|
def assert_valid_client_secret(client_secret):
|
||||||
"""Validate that a given string matches the client_secret regex defined by the spec"""
|
"""Validate that a given string matches the client_secret regex defined by the spec"""
|
||||||
if client_secret_regex.match(client_secret) is None:
|
if client_secret_regex.match(client_secret) is None:
|
||||||
|
Loading…
Reference in New Issue
Block a user