ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-23 23:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch over to stdlib json

Browse Source
This commit is contained in:
Jean-Paul Calderone 2017-07-25 11:35:54 -04:00
parent e339130e63
commit f518c2a521
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/test/web/test_web.py
View File

@ -746,7 +746,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
"""
d = self.GET("/?t=json")
def _check(res):
decoded = simplejson.loads(res)
decoded = json.loads(res)
expected = {
'introducers': {'statuses': []},
'servers': {

5
src/allmydata/web/root.py
View File

@ -1,5 +1,4 @@
import time, os
import simplejson
import time, os, json
from twisted.web import http
from nevow import rend, inevow, url, tags as T
@ -219,7 +218,7 @@ class Root(rend.Page):
},
"servers": servers
}
return simplejson.dumps(data, indent=1) + "\n"
return json.dumps(data, indent=1) + "\n"
def render_magic_folder(self, ctx, data):
if self.client._magic_folder is None: