Merge branch 'auth' into refresh

Conflicts:
	synapse/handlers/register.py

1 files changed, 3 insertions, 3 deletions

diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py

index af602bee44..17465d2af6 100644
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -319,9 +319,9 @@ class AuthHandler(BaseHandler):
 
     def generate_access_token(self, user_id):
         macaroon = pymacaroons.Macaroon(
-            location = self.hs.config.server_name,
-            identifier = "key",
-            key = self.hs.config.macaroon_secret_key)
+            location=self.hs.config.server_name,
+            identifier="key",
+            key=self.hs.config.macaroon_secret_key)
         macaroon.add_first_party_caveat("gen = 1")
         macaroon.add_first_party_caveat("user_id = %s" % (user_id,))
         macaroon.add_first_party_caveat("type = access")