Changeset 96fbff6 in trunk

Timestamp:

2020-07-09T20:05:30Z (5 years ago)

Author:

Sajith Sasidharan <sajith@…>

Branches:

master

Children:

d24babe

Parents:

92e83f26

git-author:

Sajith Sasidharan <sajith@…> (2020-04-21 14:29:18)

git-committer:

Sajith Sasidharan <sajith@…> (2020-07-09 20:05:30)

Message:

Use an inner JSONRequest class with renderJSON

Once nevow is removed from web/common.py, we can simplify
renderJSON(), like so:

def renderJSON():

req = Request()
req.args = {"t": json?}
req.fields = {}
return resource.render(req)

But for now we have to live with an inner class that implements the
nevow.inevow.IRequest interface.

File:

• src/allmydata/test/test_storage.py (modified) (2 diffs)

src/allmydata/test/test_storage.py ¶

@@ -20 +20 @@
 from nevow.inevow import IRequest
 
-from twisted.web.test.requesthelper import DummyRequest
+from twisted.web.server import Request
+from twisted.web.test.requesthelper import DummyChannel
 from zope.interface import implementer
 
@@ -3003 +3004 @@
     return flattenString(None, elem)
 
-@implementer(IRequest)
-class JSONRequest(DummyRequest):
-    """
-    A Request with t=json argument added to it.
-
-    This is useful to invoke a Resouce.render_JSON() method.
-    """
-    def __init__(self, **kwargs):
-        DummyRequest.__init__(self, b"/", **kwargs)
-        self.args = {"t": ["json"]}
-        self.fields = {}
-
 def renderJSON(resource):
-    """Exercise resouce.render_JSON()
-
-    :param _MultiFormatResource resouce: A `twisted.web.resouce.Resource`
-        that contains a render_JSON() method.
-    """
+    """Render a JSON from the given resource."""
+
+    @implementer(IRequest)
+    class JSONRequest(Request):
+        """
+        A Request with t=json argument added to it.  This is useful to
+        invoke a Resouce.render_JSON() method.
+        """
+        def __init__(self):
+            Request.__init__(self, DummyChannel())
+            self.args = {"t": ["json"]}
+            self.fields = {}
+
     return resource.render(JSONRequest())