summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-11 17:10:22 +0000
committerErik Johnston <erik@matrix.org>2015-02-11 17:10:22 +0000
commit54fdbc7e50dfdd80eda563536d08bdfef079937c (patch)
tree9d28877f14b914af743629010be54a01477ffddc /synapse/push
parentAllow newer versions of syutil (diff)
parentBump syutil version (diff)
downloadsynapse-54fdbc7e50dfdd80eda563536d08bdfef079937c.tar.xz
Merge pull request #66 from matrix-org/use-simplejson
Use simplejson
Diffstat (limited to 'synapse/push')
-rw-r--r--synapse/push/__init__.py2
-rw-r--r--synapse/push/pusherpool.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py

index 418a348a58..0659a1cb9b 100644 --- a/synapse/push/__init__.py +++ b/synapse/push/__init__.py
@@ -22,7 +22,7 @@ import synapse.util.async import baserules import logging -import json +import simplejson as json import re logger = logging.getLogger(__name__) diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py
index 5a525befd7..7483d257bf 100644 --- a/synapse/push/pusherpool.py +++ b/synapse/push/pusherpool.py
@@ -20,7 +20,7 @@ from httppusher import HttpPusher from synapse.push import PusherConfigException import logging -import json +import simplejson as json logger = logging.getLogger(__name__)