Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts

1 files changed, 9 insertions, 0 deletions

diff --git a/synapse/util/stringutils.py b/synapse/util/stringutils.py

index 52e66beaee..7a1e96af37 100644
--- a/synapse/util/stringutils.py
+++ b/synapse/util/stringutils.py
@@ -33,3 +33,12 @@ def random_string_with_symbols(length):
     return ''.join(
         random.choice(_string_with_symbols) for _ in xrange(length)
     )
+
+
+def is_ascii(s):
+    try:
+        s.encode("ascii")
+    except UnicodeDecodeError:
+        return False
+    else:
+        return True