diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-03-26 10:07:59 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-03-26 10:07:59 +0000 |
| commit | 4edcbcee3b9579f4b50ecb97e566edab1a7c4c8b (patch) | |
| tree | 5ab27c5ebbfc762ee133223fb48e868b85474c79 /synapse/util/stringutils.py | |
| parent | Set the service ID as soon as it is known. (diff) | |
| parent | Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict() (diff) | |
| download | synapse-4edcbcee3b9579f4b50ecb97e566edab1a7c4c8b.tar.xz | |
Merge branch 'develop' into application-services-txn-reliability
Conflicts: synapse/storage/__init__.py
Diffstat (limited to 'synapse/util/stringutils.py')
| -rw-r--r-- | synapse/util/stringutils.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/synapse/util/stringutils.py b/synapse/util/stringutils.py index ea53a8085c..52e66beaee 100644 --- a/synapse/util/stringutils.py +++ b/synapse/util/stringutils.py @@ -16,6 +16,10 @@ import random import string +_string_with_symbols = ( + string.digits + string.ascii_letters + ".,;:^&*-_+=#~@" +) + def origin_from_ucid(ucid): return ucid.split("@", 1)[1] @@ -23,3 +27,9 @@ def origin_from_ucid(ucid): def random_string(length): return ''.join(random.choice(string.ascii_letters) for _ in xrange(length)) + + +def random_string_with_symbols(length): + return ''.join( + random.choice(_string_with_symbols) for _ in xrange(length) + ) |