diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-20 17:53:18 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-20 17:53:18 +0100 |
| commit | 4ae0844ee3128cf4cfdcaf87216ba69f8eb1bf5d (patch) | |
| tree | 4c40d64dcf344cbfe021d3349e83d2e236f4c49f /synapse/handlers/register.py | |
| parent | more timestamp fixes (diff) | |
| parent | use a tagged version of syutil rather than master (diff) | |
| download | synapse-4ae0844ee3128cf4cfdcaf87216ba69f8eb1bf5d.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers/register.py')
| -rw-r--r-- | synapse/handlers/register.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index df562aa762..94b7890b5e 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -15,6 +15,7 @@ """Contains functions for registering clients.""" from twisted.internet import defer +from twisted.python import log from synapse.types import UserID from synapse.api.errors import ( @@ -126,7 +127,7 @@ class RegistrationHandler(BaseHandler): try: threepid = yield self._threepid_from_creds(c) except: - logger.err() + log.err() raise RegistrationError(400, "Couldn't validate 3pid") if not threepid: |