Changeset 754304e in trunk

Timestamp:

2017-07-27T19:26:30Z (8 years ago)

Author:

Jean-Paul Calderone <exarkun@…>

Branches:

master

Children:

7027547e

Parents:

f518c2a

git-author:

Jean-Paul Calderone <exarkun@…> (2017-07-25 15:36:06)

git-committer:

Jean-Paul Calderone <exarkun@…> (2017-07-27 19:26:30)

Message:

Switch Root over to MultiFormatPage?

File:

• src/allmydata/web/root.py (modified) (4 diffs)

src/allmydata/web/root.py ¶

@@ -2 +2 @@
 
 from twisted.web import http
-from nevow import rend, inevow, url, tags as T
+from nevow import rend, url, tags as T
 from nevow.inevow import IRequest
 from nevow.static import File as nevow_File # TODO: merge with static.File?
@@ -13 +13 @@
 from allmydata.web import filenode, directory, unlinked, status, operations
 from allmydata.web import storage, magic_folder
-from allmydata.web.common import abbreviate_size, getxmlfile, WebError, \
-     get_arg, RenderMixin, get_format, get_mutable_type, render_time_delta, render_time, render_time_attr
+from allmydata.web.common import (
+    abbreviate_size,
+    getxmlfile,
+    WebError,
+    get_arg,
+    MultiFormatPage,
+    RenderMixin,
+    get_format,
+    get_mutable_type,
+    render_time_delta,
+    render_time,
+    render_time_attr,
+)
 
 
@@ -127 +138 @@
 SPACE = u"\u00A0"*2
 
-class Root(rend.Page):
+class Root(MultiFormatPage):
 
     addSlash = True
@@ -187 +198 @@
         return self.client.nickname
 
-    def renderHTTP(self, ctx):
-        req = inevow.IRequest(ctx)
-        t = get_arg(req, "t")
-        if t == "json":
-            return self.json_welcome(ctx)
-        return rend.Page.renderHTTP(self, ctx)
-
-    def json_welcome(self, ctx):
-        inevow.IRequest(ctx).setHeader("content-type", "application/json; charset=utf-8")
+    def render_JSON(self, req):
+        req.setHeader("content-type", "application/json; charset=utf-8")
         intro_summaries = [s.summary for s in self.client.introducer_connection_statuses()]
         sb = self.client.get_storage_broker()