diff --git a/newsfragments/3393.minor b/newsfragments/3393.minor new file mode 100644 index 000000000..e69de29bb diff --git a/src/allmydata/web/_nevow_106.py b/src/allmydata/web/_nevow_106.py deleted file mode 100644 index 3379767a5..000000000 --- a/src/allmydata/web/_nevow_106.py +++ /dev/null @@ -1,31 +0,0 @@ -""" -Implement a work-around for . -""" - -from __future__ import ( - print_function, - unicode_literals, - absolute_import, - division, -) - -from nevow import inevow -from twisted.internet import defer - -def renderHTTP(self, ctx): - request = inevow.IRequest(ctx) - if self.real_prepath_len is not None: - request.postpath = request.prepath + request.postpath - request.prepath = request.postpath[:self.real_prepath_len] - del request.postpath[:self.real_prepath_len] - result = defer.maybeDeferred(self.original.render, request).addCallback( - self._handle_NOT_DONE_YET, request) - return result - - -def patch(): - """ - Monkey-patch the proposed fix into place. - """ - from nevow.appserver import OldResourceAdapter - OldResourceAdapter.renderHTTP = renderHTTP diff --git a/src/allmydata/web/private.py b/src/allmydata/web/private.py index fdf67a64f..fea058405 100644 --- a/src/allmydata/web/private.py +++ b/src/allmydata/web/private.py @@ -54,11 +54,6 @@ from .logs import ( create_log_resources, ) -# Hotfix work-around https://github.com/twisted/nevow/issues/106 -from . import _nevow_106 -_nevow_106.patch() -del _nevow_106 - SCHEME = b"tahoe-lafs" class IToken(ICredentials):