diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-28 15:35:39 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-28 15:35:39 +0100 |
| commit | 4d1ea4000856cd29778da2616fb8f602892905e0 (patch) | |
| tree | 68e4786675aa53586f31b27608f5acfe69a687af /synapse/util | |
| parent | Allow users to redact their own events (diff) | |
| parent | Merge branch 'release-v0.10.0' into develop (diff) | |
| download | synapse-4d1ea4000856cd29778da2616fb8f602892905e0.tar.xz | |
Merge branch 'develop' into redactyoself
Conflicts: synapse/handlers/_base.py
Diffstat (limited to 'synapse/util')
| -rw-r--r-- | synapse/util/stringutils.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/util/stringutils.py b/synapse/util/stringutils.py index 7a1e96af37..f3a36340e4 100644 --- a/synapse/util/stringutils.py +++ b/synapse/util/stringutils.py @@ -38,6 +38,8 @@ def random_string_with_symbols(length): def is_ascii(s): try: s.encode("ascii") + except UnicodeEncodeError: + return False except UnicodeDecodeError: return False else: |