summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2018-06-04 12:00:51 +0100
committerDavid Baker <dave@matrix.org>2018-06-04 12:00:51 +0100
commitf731e42baf2ffd186a79cb941017389fda030b0b (patch)
tree1a676339a343739586f971ef1ea7977ec3c86edc
parentMerge remote-tracking branch 'origin/develop' into dbkr/unbind (diff)
downloadsynapse-f731e42baf2ffd186a79cb941017389fda030b0b.tar.xz
docstring
-rw-r--r--synapse/handlers/identity.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py
index 92cd4019d8..434eb17ef0 100644
--- a/synapse/handlers/identity.py
+++ b/synapse/handlers/identity.py
@@ -142,7 +142,15 @@ class IdentityHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def unbind_threepid(self, mxid, threepid):
-        yield run_on_reactor()
+        """
+        Removes a binding from an identity server
+        Args:
+            mxid (str): Matrix user ID of binding to be removed
+            threepid (dict): Dict with medium & address of binding to be removed
+
+        Returns:
+            Deferred
+        """
         logger.debug("unbinding threepid %r from %s", threepid, mxid)
         if not self.trusted_id_servers:
             logger.warn("Can't unbind threepid: no trusted ID servers set in config")