ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-31 16:36:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 3387.expirer-python-3

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2020-08-25 13:57:32 -04:00
commit 23671b02a4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
newsfragments/3381.minor Normal file
View File

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

@ -53,7 +53,6 @@ from allmydata.web.common import (
get_mutable_type,
get_filenode_metadata,
render_time,
MultiFormatPage,
MultiFormatResource,
SlotsSequenceElement,
)
@ -1213,7 +1212,7 @@ class ManifestElement(ReloadableMonitorElement):
class ManifestResults(MultiFormatResource, ReloadMixin):
# Control MultiFormatPage
# Control MultiFormatResource
formatArgument = "output"
formatDefault = "html"
@ -1268,8 +1267,9 @@ class ManifestResults(MultiFormatResource, ReloadMixin):
return json.dumps(status, indent=1)
class DeepSizeResults(MultiFormatPage):
# Control MultiFormatPage
class DeepSizeResults(MultiFormatResource):
# Control MultiFormatResource
formatArgument = "output"
formatDefault = "html"