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

tolerate simplejson-2.0.0 and newer, which frequently return bytestrings instead of unicode objects. Closes #523

Browse Source
This commit is contained in:
Brian Warner 2008-09-30 15:21:06 -07:00
parent 1a3f154c21
commit 935d185696
6 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/allmydata/scripts/tahoe_cp.py
View File

@ -222,7 +222,9 @@ class TahoeDirectorySource:
nodetype, d = parsed
assert nodetype == "dirnode"
self.mutable = d.get("mutable", False) # older nodes don't provide it
self.children_d = d["children"]
self.children_d = dict( [(unicode(name),value)
for (name,value)
in d["children"].iteritems()] )
self.children = None
def init_from_parsed(self, parsed):
@ -230,7 +232,9 @@ class TahoeDirectorySource:
self.writecap = ascii_or_none(d.get("rw_uri"))
self.readcap = ascii_or_none(d.get("ro_uri"))
self.mutable = d.get("mutable", False) # older nodes don't provide it
self.children_d = d["children"]
self.children_d = dict( [(unicode(name),value)
for (name,value)
in d["children"].iteritems()] )
self.children = None
def populate(self, recurse):
@ -294,7 +298,9 @@ class TahoeDirectoryTarget:
self.writecap = ascii_or_none(d.get("rw_uri"))
self.readcap = ascii_or_none(d.get("ro_uri"))
self.mutable = d.get("mutable", False) # older nodes don't provide it
self.children_d = d["children"]
self.children_d = dict( [(unicode(name),value)
for (name,value)
in d["children"].iteritems()] )
self.children = None
def init_from_grid(self, writecap, readcap):
@ -308,7 +314,9 @@ class TahoeDirectoryTarget:
nodetype, d = parsed
assert nodetype == "dirnode"
self.mutable = d.get("mutable", False) # older nodes don't provide it
self.children_d = d["children"]
self.children_d = dict( [(unicode(name),value)
for (name,value)
in d["children"].iteritems()] )
self.children = None
def just_created(self, writecap):

1
src/allmydata/scripts/tahoe_ls.py
View File

@ -53,6 +53,7 @@ def list(options):
rows = []
for name in childnames:
name = unicode(name)
child = children[name]
childtype = child[0]
ctime = child[1]["metadata"].get("ctime")

4
src/allmydata/scripts/tahoe_mv.py
View File

@ -25,8 +25,8 @@ def mv(options, mode="move"):
data = urllib.urlopen(from_url + "?t=json").read()
nodetype, attrs = simplejson.loads(data)
cap = attrs.get("rw_uri") or attrs["ro_uri"]
# simplejson always returns unicode, but we know that it's really just an
# ASCII file-cap.
# simplejson sometimes returns unicode, but we know that it's really just
# an ASCII file-cap.
cap = str(cap)
# now get the target

5
src/allmydata/test/check_load.py
View File

@ -115,7 +115,10 @@ def listdir(nodeurl, root, vdrive_pathname):
assert nodetype == "dirnode"
global directories_read
directories_read += 1
return d['children']
children = dict( [(unicode(name),value)
for (name,value)
in d["children"].iteritems()] )
return children
def choose_random_descendant(server_url, root, pathname=""):

12
src/allmydata/test/test_web.py
View File

@ -197,7 +197,7 @@ class WebMixin(object):
def failUnlessIsBarJSON(self, res):
data = simplejson.loads(res)
self.failUnless(isinstance(data, list))
self.failUnlessEqual(data[0], "filenode")
self.failUnlessEqual(data[0], u"filenode")
self.failUnless(isinstance(data[1], dict))
self.failIf(data[1]["mutable"])
self.failIf("rw_uri" in data[1]) # immutable
@ -214,11 +214,13 @@ class WebMixin(object):
self.failUnlessEqual(data[1]["rw_uri"], self._foo_uri)
self.failUnlessEqual(data[1]["ro_uri"], self._foo_readonly_uri)
kidnames = sorted(data[1]["children"])
kidnames = sorted([unicode(n) for n in data[1]["children"]])
self.failUnlessEqual(kidnames,
[u"bar.txt", u"blockingfile", u"empty",
u"n\u00fc.txt", u"sub"])
kids = data[1]["children"]
kids = dict( [(unicode(name),value)
for (name,value)
in data[1]["children"].iteritems()] )
self.failUnlessEqual(kids[u"sub"][0], "dirnode")
self.failUnless("metadata" in kids[u"sub"][1])
self.failUnless("ctime" in kids[u"sub"][1]["metadata"])
@ -1226,7 +1228,9 @@ class Web(WebMixin, unittest.TestCase):
def _check_page_json(res):
parsed = simplejson.loads(res)
self.failUnlessEqual(parsed[0], "dirnode")
children = parsed[1]["children"]
children = dict( [(unicode(name),value)
for (name,value)
in parsed[1]["children"].iteritems()] )
self.failUnless("new.txt" in children)
new_json = children["new.txt"]
self.failUnlessEqual(new_json[0], "filenode")

1
src/allmydata/web/directory.py
View File

@ -372,6 +372,7 @@ class DirectoryNodeHandler(RenderMixin, rend.Page, ReplaceMeMixin):
raise
cs = []
for name, (file_or_dir, mddict) in children.iteritems():
name = unicode(name) # simplejson-2.0.1 returns str *or* unicode
cap = str(mddict.get('rw_uri') or mddict.get('ro_uri'))
cs.append((name, cap, mddict.get('metadata')))
d = self.node.set_children(cs, replace)