Formatting changes

2 files changed, 14 insertions, 6 deletions

diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py
index 0ad28c4948..484f719253 100644
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -298,7 +298,8 @@ class AuthHandler(BaseHandler):
     @defer.inlineCallbacks
     def login_with_cas_user_id(self, user_id):
         """
-        Authenticates the user with the given user ID, intended to have been captured from a CAS response
+        Authenticates the user with the given user ID,
+        intended to have been captured from a CAS response
 
         Args:
             user_id (str): User ID
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
index 56e5cf79fe..4de5f19591 100644
--- a/synapse/rest/client/v1/login.py
+++ b/synapse/rest/client/v1/login.py
@@ -77,9 +77,13 @@ class LoginRestServlet(ClientV1RestServlet):
                     "uri": "%s%s" % (self.idp_redirect_url, relay_state)
                 }
                 defer.returnValue((200, result))
-            elif self.cas_enabled and (login_submission["type"] == LoginRestServlet.CAS_TYPE):
+            elif self.cas_enabled and (login_submission["type"] ==
+                                       LoginRestServlet.CAS_TYPE):
                 url = "%s/proxyValidate" % (self.cas_server_url)
-                parameters = {"ticket": login_submission["ticket"], "service": login_submission["service"]}
+                parameters = {
+                    "ticket": login_submission["ticket"],
+                    "service": login_submission["service"]
+                }
                 response = requests.get(url, verify=False, params=parameters)
                 result = yield self.do_cas_login(response.text)
                 defer.returnValue(result)
@@ -130,7 +134,8 @@ class LoginRestServlet(ClientV1RestServlet):
                 auth_handler = self.handlers.auth_handler
                 user_exists = yield auth_handler.does_user_exist(user_id)
                 if user_exists:
-                    user_id, access_token, refresh_token = yield auth_handler.login_with_cas_user_id(user_id)
+                    user_id, access_token, refresh_token = yield
+                    auth_handler.login_with_cas_user_id(user_id)
                     result = {
                         "user_id": user_id,  # may have changed
                         "access_token": access_token,
@@ -139,7 +144,8 @@ class LoginRestServlet(ClientV1RestServlet):
                     }
 
                 else:
-                    user_id, access_token = yield self.handlers.registration_handler.register(localpart=user)
+                    user_id, access_token = yield
+                    self.handlers.registration_handler.register(localpart=user)
                     result = {
                         "user_id": user_id,  # may have changed
                         "access_token": access_token,
@@ -148,7 +154,6 @@ class LoginRestServlet(ClientV1RestServlet):
 
             defer.returnValue((200, result))
 
-
         raise LoginError(401, "Invalid CAS response", errcode=Codes.UNAUTHORIZED)
 
 
@@ -224,6 +229,7 @@ class SAML2RestServlet(ClientV1RestServlet):
             defer.returnValue(None)
         defer.returnValue((200, {"status": "not_authenticated"}))
 
+
 class CasRestServlet(ClientV1RestServlet):
     PATTERN = client_path_pattern("/login/cas")
 
@@ -234,6 +240,7 @@ class CasRestServlet(ClientV1RestServlet):
     def on_GET(self, request):
         return (200, {"serverUrl": self.cas_server_url})
 
+
 def _parse_json(request):
     try:
         content = json.loads(request.content.read())