summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-08-25 10:42:59 +0100
committerMark Haines <mark.haines@matrix.org>2015-08-25 10:42:59 +0100
commitcf8c04948f9a8e8f50349918622164abd7590a13 (patch)
tree81120ac1a368f233785d4d041564b5efc5f20672
parentFix indent (diff)
downloadsynapse-cf8c04948f9a8e8f50349918622164abd7590a13.tar.xz
Fix typo in module imports and package dependencies
-rw-r--r--synapse/config/key.py2
-rw-r--r--synapse/python_dependencies.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py
index 0f90bce04e..23ac8a3fca 100644
--- a/synapse/config/key.py
+++ b/synapse/config/key.py
@@ -21,7 +21,7 @@ from signedjson.key import (
     decode_signing_key_base64, decode_verify_key_bytes,
     read_signing_keys, write_signing_keys, NACL_ED25519
 )
-from unpadded_base64 import decode_base64
+from unpaddedbase64 import decode_base64
 
 import os
 
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index ced7ff0d7e..4c07aa07aa 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -19,7 +19,7 @@ logger = logging.getLogger(__name__)
 
 REQUIREMENTS = {
     "unpaddedbase64>=1.0.1": ["unpaddedbase64>=1.0.1"],
-    "canonicaljson>=1.0.0": ["canconicaljson>=1.0.0"],
+    "canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"],
     "signedjson>=1.0.0": ["signedjson>=1.0.0"],
     "Twisted>=15.1.0": ["twisted>=15.1.0"],
     "service_identity>=1.0.0": ["service_identity>=1.0.0"],