summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-28 16:00:07 +0100
committerErik Johnston <erik@matrix.org>2015-05-28 16:00:07 +0100
commit2f54522d444a106202ba3ae9968c03391bf040c4 (patch)
treedaf3dc014cc9ea50840beed6050329da3ea1bdfc
parentRegistration should be disabled by default (diff)
parentUnused import (diff)
downloadsynapse-2f54522d444a106202ba3ae9968c03391bf040c4.tar.xz
Merge pull request #167 from matrix-org/erikj/deep_copy_removal
Remove a deep copy
-rw-r--r--synapse/util/jsonobject.py12
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__))