summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 17:13:33 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 17:13:33 +0100
commitd5a825edee07cc0e66904283ea86a923b50beb69 (patch)
tree8b06dbdbac6d79c6a23b3fb8037b579ccf223a8e
parentMerge branch 'develop' into refresh (diff)
parentRemove incorrect whitespace (diff)
downloadsynapse-d5a825edee07cc0e66904283ea86a923b50beb69.tar.xz
Merge branch 'auth' into refresh
Conflicts:
	synapse/handlers/register.py
-rw-r--r--synapse/handlers/auth.py6
-rw-r--r--synapse/python_dependencies.py2
2 files changed, 4 insertions, 4 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")
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index fa24199377..a87fdeb2a0 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -24,7 +24,7 @@ REQUIREMENTS = {
     "pyopenssl>=0.14": ["OpenSSL>=0.14"],
     "pyyaml": ["yaml"],
     "pyasn1": ["pyasn1"],
-    "pynacl>=0.0.3": ["nacl>=0.0.3"],
+    "pynacl>=0.3.0": ["nacl>=0.3.0"],
     "daemonize": ["daemonize"],
     "py-bcrypt": ["bcrypt"],
     "frozendict>=0.4": ["frozendict"],