From 4c67e06dfb0dfb69f173b81c0d7be86a44616fe3 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 27 Jun 2016 13:18:04 +0100
Subject: [PATCH] Use JSON instead of msgpack

---
 synapse/types.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/synapse/types.py b/synapse/types.py
index f0ad527bc0..0f787d3a43 100644
--- a/synapse/types.py
+++ b/synapse/types.py
@@ -18,7 +18,7 @@ from synapse.api.errors import SynapseError
 from collections import namedtuple
 
 from unpaddedbase64 import encode_base64, decode_base64
-import msgpack
+import ujson as serializer
 
 
 Requester = namedtuple("Requester", ["user", "access_token_id", "is_guest"])
@@ -127,7 +127,7 @@ class SyncNextBatchToken(
     @classmethod
     def from_string(cls, string):
         try:
-            d = msgpack.loads(decode_base64(string))
+            d = serializer.loads(decode_base64(string))
             pa = d.get("pa", None)
             if pa:
                 pa = SyncPaginationState.from_dict(pa)
@@ -139,7 +139,7 @@ class SyncNextBatchToken(
             raise SynapseError(400, "Invalid Token")
 
     def to_string(self):
-        return encode_base64(msgpack.dumps({
+        return encode_base64(serializer.dumps({
             "t": self.stream_token.to_arr(),
             "pa": self.pagination_state.to_dict() if self.pagination_state else None,
         }))