diff options
| author | Erik Johnston <erik@matrix.org> | 2015-06-12 11:53:03 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-06-12 11:53:03 +0100 |
| commit | 405f8c47961c46aa225aa4b30f3774528929d9ed (patch) | |
| tree | a266f69bc3147bf232595794bb6d36e024330ef9 /synapse/util | |
| parent | Merge branch 'release-v0.9.1' of github.com:matrix-org/synapse (diff) | |
| parent | Mention config option name (diff) | |
| download | synapse-405f8c47961c46aa225aa4b30f3774528929d9ed.tar.xz | |
Merge branch 'release-v0.9.2' v0.9.2
Diffstat (limited to 'synapse/util')
| -rw-r--r-- | synapse/util/jsonobject.py | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/synapse/util/jsonobject.py b/synapse/util/jsonobject.py index 0765f7d217..00f86ed220 100644 --- a/synapse/util/jsonobject.py +++ b/synapse/util/jsonobject.py @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import copy - class JsonEncodedObject(object): """ A common base class for defining protocol units that are represented @@ -76,15 +74,7 @@ class JsonEncodedObject(object): if k in self.valid_keys and k not in self.internal_keys } d.update(self.unrecognized_keys) - return copy.deepcopy(d) - - def get_full_dict(self): - d = { - 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) - return copy.deepcopy(d) + return d def __str__(self): return "(%s, %s)" % (self.__class__.__name__, repr(self.__dict__)) |