ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-05-03 01:22:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

methods shouldn't be named like classes

Browse Source
This commit is contained in:
meejah 2020-02-29 05:40:51 -07:00
parent 0acf0d2a7e
commit 882c63dab9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/allmydata/web/filenode.py
View File

@ -209,14 +209,14 @@ class FileNodeHandler(Resource, ReplaceMeMixin, object):
self.parentnode.get_metadata_for(self.name)) self.parentnode.get_metadata_for(self.name))
else: else:
d.addCallback(lambda ignored: None) d.addCallback(lambda ignored: None)
d.addCallback(lambda md: FileJSONMetadata(req, self.node, md)) d.addCallback(lambda md: _file_json_metadata(req, self.node, md))
return d return d
if t == "info": if t == "info":
return MoreInfo(self.node) return MoreInfo(self.node)
if t == "uri": if t == "uri":
return FileURI(req, self.node) return _file_uri(req, self.node)
if t == "readonly-uri": if t == "readonly-uri":
return FileReadOnlyURI(req, self.node) return _file_read_only_uri(req, self.node)
raise WebError("GET file: bad t=%s" % t) raise WebError("GET file: bad t=%s" % t)
def render_HEAD(self, req): def render_HEAD(self, req):
@ -498,7 +498,7 @@ class FileDownloader(Resource, object):
return req.deferred return req.deferred
def FileJSONMetadata(req, filenode, edge_metadata): def _file_json_metadata(req, filenode, edge_metadata):
rw_uri = filenode.get_write_uri() rw_uri = filenode.get_write_uri()
ro_uri = filenode.get_readonly_uri() ro_uri = filenode.get_readonly_uri()
data = ("filenode", get_filenode_metadata(filenode)) data = ("filenode", get_filenode_metadata(filenode))
@ -514,14 +514,17 @@ def FileJSONMetadata(req, filenode, edge_metadata):
return text_plain(json.dumps(data, indent=1) + "\n", req) return text_plain(json.dumps(data, indent=1) + "\n", req)
def FileURI(req, filenode):
def _file_uri(req, filenode):
return text_plain(filenode.get_uri(), req) return text_plain(filenode.get_uri(), req)
def FileReadOnlyURI(req, filenode):
def _file_read_only_uri(req, filenode):
if filenode.is_readonly(): if filenode.is_readonly():
return text_plain(filenode.get_uri(), req) return text_plain(filenode.get_uri(), req)
return text_plain(filenode.get_readonly_uri(), req) return text_plain(filenode.get_readonly_uri(), req)
class FileNodeDownloadHandler(FileNodeHandler): class FileNodeDownloadHandler(FileNodeHandler):
def getChild(self, name, req): def getChild(self, name, req):
return FileNodeDownloadHandler(self.client, self.node, name=name) return FileNodeDownloadHandler(self.client, self.node, name=name)