summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-08-06 21:39:44 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-08-06 21:39:44 +0100
commit7bcf126b18052687224794b24f0b096ec0828447 (patch)
tree49c76133555033be6faf85aa86e92a987e5640b5 /synapse/api
parentMerge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... (diff)
parentupdate comments to reflect new sig (diff)
downloadsynapse-7bcf126b18052687224794b24f0b096ec0828447.tar.xz
Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/disable_hs
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/auth.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index 089f166152..9c62ec4374 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -778,10 +778,7 @@ class Auth(object):
     def check_auth_blocking(self):
         """Checks if the user should be rejected for some external reason,
         such as monthly active user limiting or global disable flag
-        Args:
-            error (Error): The error that should be raised if user is to be
-            blocked
-            """
+        """
         if self.hs.config.hs_disabled:
             raise AuthError(
                 403, self.hs.config.hs_disabled_message, errcode=Codes.HS_DISABLED