diff options
author | Erik Johnston <erik@matrix.org> | 2014-09-18 14:31:47 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-09-18 14:31:47 +0100 |
commit | 335e5d131c90b82d1e7aa3955079f549fc211540 (patch) | |
tree | e21eae5ca01c2ab157e44eca2f8c2efe99735f23 /synapse/api/events/__init__.py | |
parent | Merge branch 'release-v0.3.0' of github.com:matrix-org/synapse (diff) | |
parent | Merge branch 'develop' into test-sqlite-memory (diff) | |
download | synapse-335e5d131c90b82d1e7aa3955079f549fc211540.tar.xz |
Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop
Conflicts: tests/handlers/test_profile.py
Diffstat (limited to 'synapse/api/events/__init__.py')
-rw-r--r-- | synapse/api/events/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/events/__init__.py b/synapse/api/events/__init__.py index a9991e9c94..0cee196851 100644 --- a/synapse/api/events/__init__.py +++ b/synapse/api/events/__init__.py @@ -156,7 +156,8 @@ class SynapseEvent(JsonEncodedObject): return "Missing %s key" % key if type(content[key]) != type(template[key]): - return "Key %s is of the wrong type." % key + return "Key %s is of the wrong type (got %s, want %s)" % ( + key, type(content[key]), type(template[key])) if type(content[key]) == dict: # we must go deeper |