diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-06-24 10:00:13 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-06-24 10:00:13 +0100 |
| commit | 5097aee740b542407e5bb13d19a3e3e6c2227316 (patch) | |
| tree | 09a03650256e09cd0b5df59dbf2d7bb2ba14df6c /synapse/util/jsonobject.py | |
| parent | changelog (diff) | |
| parent | Improve help and cmdline option names for --generate-config options (#5512) (diff) | |
| download | synapse-5097aee740b542407e5bb13d19a3e3e6c2227316.tar.xz | |
Merge branch 'develop' into rav/cleanup_metrics
Diffstat (limited to 'synapse/util/jsonobject.py')
| -rw-r--r-- | synapse/util/jsonobject.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/util/jsonobject.py b/synapse/util/jsonobject.py index d668e5a6b8..6dce03dd3a 100644 --- a/synapse/util/jsonobject.py +++ b/synapse/util/jsonobject.py @@ -70,7 +70,8 @@ class JsonEncodedObject(object): dict """ d = { - k: _encode(v) for (k, v) in self.__dict__.items() + k: _encode(v) + for (k, v) in self.__dict__.items() if k in self.valid_keys and k not in self.internal_keys } d.update(self.unrecognized_keys) @@ -78,7 +79,8 @@ class JsonEncodedObject(object): def get_internal_dict(self): d = { - k: _encode(v, internal=True) for (k, v) in self.__dict__.items() + k: _encode(v, internal=True) + for (k, v) in self.__dict__.items() if k in self.valid_keys } d.update(self.unrecognized_keys) |