From fcbc60c1836ae7cc895a9f302606b67a900e000a Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 30 Sep 2019 15:00:24 +1000 Subject: minimaws: python 2 is more fussy about generator function distinction (nw) --- scripts/minimaws/lib/wsgiserve.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/minimaws/lib/wsgiserve.py b/scripts/minimaws/lib/wsgiserve.py index f05ba6b7e76..4c64feb6e76 100644 --- a/scripts/minimaws/lib/wsgiserve.py +++ b/scripts/minimaws/lib/wsgiserve.py @@ -438,9 +438,12 @@ class RomIdentHandler(QueryPageHandler): return self.error_page(405) else: self.start_response('200 OK', [('Content-type', 'text/html; chearset=utf-8'), ('Cache-Control', 'public, max-age=3600')]) - yield htmltmpl.ROMIDENT_PAGE.substitute( - app=self.js_escape(cgi.escape(self.application_uri, True)), - assets=self.js_escape(cgi.escape(urlparse.urljoin(self.application_uri, 'static'), True))).encode('utf-8') + return self.form_page() + + def form_page(self): + yield htmltmpl.ROMIDENT_PAGE.substitute( + app=self.js_escape(cgi.escape(self.application_uri, True)), + assets=self.js_escape(cgi.escape(urlparse.urljoin(self.application_uri, 'static'), True))).encode('utf-8') class BiosRpcHandler(MachineRpcHandlerBase): -- cgit v1.2.3-70-g09d2