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

use twisted-web APIs, not nevow

Browse Source
This commit is contained in:
meejah 2019-11-18 16:56:04 -07:00
parent 044d1cfbea
commit 74ce166463
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,8 +129,13 @@ class DirectoryNodeHandler(ReplaceMeMixin, Resource, object):
"""
Callback when self.node.get has returned
"""
method = req.method
nonterminal = len(req.postpath) > 1
# we used to determine if a request was 'terminal' by
# examining req.postpath .. but that's a Nevow-ism, so we
# determine if this is a "terminal" request using only Twisted
# Web APIs, which means finding where "name" is in the path
u = URL.from_text(unicode(req.path)).to_iri()
assert name in u.path, "Can't find our child-name in the path"
nonterminal = (u.path[-1] != name)
t = get_arg(req, "t", "").strip() # XXX looking like MultiFormatResource..
if isinstance(node_or_failure, Failure):
f = node_or_failure
@ -151,7 +156,7 @@ class DirectoryNodeHandler(ReplaceMeMixin, Resource, object):
("POST", "mkdir-with-children"),
("POST", "mkdir-immutable")
)
if (method, t) in terminal_requests:
if (req.method, t) in terminal_requests:
# final directory
kids = {}
if t in ("mkdir-with-children", "mkdir-immutable"):
@ -181,7 +186,7 @@ class DirectoryNodeHandler(ReplaceMeMixin, Resource, object):
("PUT",""),
("PUT","uri"),
)
if (method, t) in leaf_requests:
if (req.method, t) in leaf_requests:
# we were trying to find the leaf filenode (to put a new
# file in its place), and it didn't exist. That's ok,
# since that's the leaf node that we're about to create.