summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-07-12 14:13:14 +0100
committerDavid Baker <dave@matrix.org>2016-07-12 14:13:14 +0100
commitaaa9d9f0e1d761655c4976a45a76dfba31f067de (patch)
treeca227fe5d75855c3ef01f7876b0322353814661e
parentRemove other debug logging (diff)
downloadsynapse-aaa9d9f0e1d761655c4976a45a76dfba31f067de.tar.xz
on_OPTIONS isn't neccessary
-rw-r--r--synapse/rest/client/v2_alpha/account.py8
-rw-r--r--synapse/rest/client/v2_alpha/register.py3
2 files changed, 1 insertions, 10 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py
index d85b2d08aa..64e9ae0c45 100644
--- a/synapse/rest/client/v2_alpha/account.py
+++ b/synapse/rest/client/v2_alpha/account.py
@@ -46,7 +46,7 @@ class PasswordRequestTokenRestServlet(RestServlet):
             if k not in body:
                 absent.append(k)
 
-        if len(absent) > 0:
+        if absent:
             raise SynapseError(400, "Missing params: %r" % absent, Codes.MISSING_PARAM)
 
         existingUid = yield self.hs.get_datastore().get_user_id_by_threepid(
@@ -59,9 +59,6 @@ class PasswordRequestTokenRestServlet(RestServlet):
         ret = yield self.identity_handler.requestEmailToken(**body)
         defer.returnValue((200, ret))
 
-    def on_OPTIONS(self, _):
-        return 200, {}
-
 
 class PasswordRestServlet(RestServlet):
     PATTERNS = client_v2_patterns("/account/password$")
@@ -155,9 +152,6 @@ class ThreepidRequestTokenRestServlet(RestServlet):
         ret = yield self.identity_handler.requestEmailToken(**body)
         defer.returnValue((200, ret))
 
-    def on_OPTIONS(self, _):
-        return 200, {}
-
 
 class ThreepidRestServlet(RestServlet):
     PATTERNS = client_v2_patterns("/account/3pid$")
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py
index e5944b99b1..7c6d2942dc 100644
--- a/synapse/rest/client/v2_alpha/register.py
+++ b/synapse/rest/client/v2_alpha/register.py
@@ -72,9 +72,6 @@ class RegisterRequestTokenRestServlet(RestServlet):
         ret = yield self.identity_handler.requestEmailToken(**body)
         defer.returnValue((200, ret))
 
-    def on_OPTIONS(self, _):
-        return 200, {}
-
 
 class RegisterRestServlet(RestServlet):
     PATTERNS = client_v2_patterns("/register$")