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/http | |
| parent | Mention new libs in CHANGES (diff) | |
| download | synapse-4ebbaf0d4382813ba896f3e8101de12e112cbed5.tar.xz | |
Blunty replace json with simplejson
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/client.py | 2 | ||||
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index 198f575cfa..d500e19c81 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -23,7 +23,7 @@ from twisted.web.http_headers import Headers from StringIO import StringIO -import json +import simplejson as json import logging import urllib diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 056d446e42..406203acf2 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -33,7 +33,7 @@ from synapse.api.errors import ( from syutil.crypto.jsonsign import sign_json -import json +import simplejson as json import logging import urllib import urlparse |