summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-21 10:19:15 +0000
committerErik Johnston <erik@matrix.org>2016-01-21 10:19:15 +0000
commitd54005059c07456f6c2a72f9359fe8c97ceaeb34 (patch)
treef388d2b5ecd0ba1eb9aceffae3c686d5d64c9472 /synapse/handlers
parentAdd another graph contrib (diff)
parentMerge pull request #507 from matrix-org/push_badge_counts (diff)
downloadsynapse-d54005059c07456f6c2a72f9359fe8c97ceaeb34.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/register.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 8e601b052b..1e99c1303c 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -49,11 +49,10 @@ class RegistrationHandler(BaseHandler):
     def check_username(self, localpart, guest_access_token=None):
         yield run_on_reactor()
 
-        if urllib.quote(localpart) != localpart:
+        if urllib.quote(localpart.encode('utf-8')) != localpart:
             raise SynapseError(
                 400,
-                "User ID must only contain characters which do not"
-                " require URL encoding.",
+                "User ID can only contain characters a-z, 0-9, or '-./'",
                 Codes.INVALID_USERNAME
             )