mirror of
https://github.com/element-hq/synapse.git
synced 2026-10-22 19:44:06 +00:00
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>
This commit is contained in:
1 parent
498084228b
commit
bd918d874f
2 files changed
+2
-3
No files matched your search
@@ -0,0 +1 @@
|
||||
Simplify a few helper functions.
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in new issue
Block a user