diff options
| author | Dan Callahan <danc@element.io> | 2021-05-14 10:58:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-14 10:58:52 +0100 |
| commit | bd918d874f4eb459b9c2f9af6e8e994b6b19d264 (patch) | |
| tree | dcd02db35a185356070ec7340def13c02dea0dca /synapse/util/stringutils.py | |
| parent | Use Python's secrets module instead of random (#9984) (diff) | |
| download | synapse-bd918d874f4eb459b9c2f9af6e8e994b6b19d264.tar.xz | |
Simplify exception handling in is_ascii. (#9985)
We can get away with just catching UnicodeError here.
⋮
+-- ValueError
| +-- UnicodeError
| +-- UnicodeDecodeError
| +-- UnicodeEncodeError
| +-- UnicodeTranslateError
⋮
https://docs.python.org/3/library/exceptions.html#exception-hierarchy
Signed-off-by: Dan Callahan <danc@element.io>Diffstat (limited to 'synapse/util/stringutils.py')
| -rw-r--r-- | synapse/util/stringutils.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/util/stringutils.py b/synapse/util/stringutils.py index 40cd51a8ca..f029432191 100644 --- a/synapse/util/stringutils.py +++ b/synapse/util/stringutils.py @@ -55,9 +55,7 @@ def random_string_with_symbols(length: int) -> str: def is_ascii(s: bytes) -> bool: try: s.decode("ascii").encode("ascii") - except UnicodeDecodeError: - return False - except UnicodeEncodeError: + except UnicodeError: return False return True |