From fa02e46033d38a5350eb9b92fdf8da8d5761cd06 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 15 Oct 2020 16:02:32 -0400
Subject: [PATCH] maybeDeferred always returns a Deferred

---
 src/allmydata/web/common.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/allmydata/web/common.py b/src/allmydata/web/common.py
index 441269d6e..1de1fc073 100644
--- a/src/allmydata/web/common.py
+++ b/src/allmydata/web/common.py
@@ -483,18 +483,8 @@ def render_exception(render):
     def g(self, request):
         bound_render = render.__get__(self, type(self))
         result = maybeDeferred(bound_render, request)
-        if isinstance(result, Deferred):
-            result.addBoth(_finish, bound_render, request)
-            return NOT_DONE_YET
-        elif isinstance(result, bytes):
-            return result
-        elif result == NOT_DONE_YET:
-            return NOT_DONE_YET
-        else:
-            raise Exception("{!r} returned unusable {!r}".format(
-                fullyQualifiedName(bound_render),
-                result,
-            ))
+        result.addBoth(_finish, bound_render, request)
+        return NOT_DONE_YET
 
     return g