Merge pull request #2159 from matrix-org/erikj/reduce_join_cache_size

Reduce size of joined_user cache

1 files changed, 14 insertions, 0 deletions

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

index a100f151d4..95a6168e16 100644
--- a/synapse/util/stringutils.py
+++ b/synapse/util/stringutils.py
@@ -40,3 +40,17 @@ def is_ascii(s):
         return False
     else:
         return True
+
+
+def to_ascii(s):
+    """Converts a string to ascii if it is ascii, otherwise leave it alone.
+
+    If given None then will return None.
+    """
+    if s is None:
+        return None
+
+    try:
+        return s.encode("ascii")
+    except UnicodeEncodeError:
+        return s