diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2015-03-12 18:56:53 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2015-03-12 18:56:53 +0000 |
| commit | f55bd3f94bf98a9470f5cd2ccec1100dd64e573a (patch) | |
| tree | ecbe291f35092b8659a52f2e51b4eeeebe00f21f /synapse | |
| parent | More sacrifices to the pep8 gods. (diff) | |
| download | synapse-f55bd3f94bf98a9470f5cd2ccec1100dd64e573a.tar.xz | |
bump dep on syweb 0.6.5
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/python_dependencies.py | 2 | ||||
| -rw-r--r-- | synapse/rest/appservice/v1/register.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 5fe8a825e3..471d1ccd60 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -5,7 +5,7 @@ logger = logging.getLogger(__name__) REQUIREMENTS = { "syutil>=0.0.3": ["syutil"], - "matrix_angular_sdk>=0.6.4": ["syweb>=0.6.4"], + "matrix_angular_sdk>=0.6.5": ["syweb>=0.6.5"], "Twisted==14.0.2": ["twisted==14.0.2"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "pyopenssl>=0.14": ["OpenSSL>=0.14"], diff --git a/synapse/rest/appservice/v1/register.py b/synapse/rest/appservice/v1/register.py index a4f6159773..ea24d88f79 100644 --- a/synapse/rest/appservice/v1/register.py +++ b/synapse/rest/appservice/v1/register.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Copyright 2015 OpenMarket Ltd # -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # @@ -89,7 +89,8 @@ def _parse_json(request): if type(content) != dict: raise SynapseError(400, "Content must be a JSON object.") return content - except ValueError: + except ValueError as e: + logger.warn(e) raise SynapseError(400, "Content not JSON.") |