diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-19 18:03:57 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-19 18:03:57 +0000 |
| commit | 19977b465913c3cb263d88884e16f9dc13f2a05e (patch) | |
| tree | 6015e4155502d34fd8aa35fc32094d8c29981a0a /synapse/util/jsonobject.py | |
| parent | Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.5.0 (diff) | |
| download | synapse-19977b465913c3cb263d88884e16f9dc13f2a05e.tar.xz | |
Merge branch 'release-v0.5.0' of github.com:matrix-org/synapse v0.5.0
Diffstat (limited to 'synapse/util/jsonobject.py')
| -rw-r--r-- | synapse/util/jsonobject.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/jsonobject.py b/synapse/util/jsonobject.py index c91eb897a8..e79b68f661 100644 --- a/synapse/util/jsonobject.py +++ b/synapse/util/jsonobject.py @@ -80,7 +80,7 @@ class JsonEncodedObject(object): def get_full_dict(self): d = { - k: v for (k, v) in self.__dict__.items() + k: _encode(v) for (k, v) in self.__dict__.items() if k in self.valid_keys or k in self.internal_keys } d.update(self.unrecognized_keys) |