diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-11 14:23:10 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-11 14:23:10 +0000 |
| commit | 4ebbaf0d4382813ba896f3e8101de12e112cbed5 (patch) | |
| tree | 179bf2e1a0d0330437518eff45788604ab2f4ad7 /synapse/push | |
| parent | Mention new libs in CHANGES (diff) | |
| download | synapse-4ebbaf0d4382813ba896f3e8101de12e112cbed5.tar.xz | |
Blunty replace json with simplejson
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/push/pusherpool.py | 2 |
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__) |