Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-26 03:19:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Simplify exception handling in is_ascii. (#9985)

Browse Source 
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>
This commit is contained in:
Dan Callahan 2021-05-14 10:58:52 +01:00 committed by GitHub
parent 498084228b
commit bd918d874f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/9985.misc Normal file
View File

@ -0,0 +1 @@
Simplify a few helper functions.

4
synapse/util/stringutils.py
View File

@ -55,9 +55,7 @@ def random_string_with_symbols(length: int) -> str:
def is_ascii(s: bytes) -> bool: def is_ascii(s: bytes) -> bool:
try: try:
s.decode("ascii").encode("ascii") s.decode("ascii").encode("ascii")
except UnicodeDecodeError: except UnicodeError:
return False
except UnicodeEncodeError:
return False return False
return True return True