pictuga
/
morss
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

morss: middleware to enforce encoding 

bytes are always expected
master
pictuga 2020-03-21 23:23:50 +01:00
parent ec0a28a91d
commit 463530f02c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
morss/morss.py
View File

@ -628,6 +628,10 @@ def cgi_error_handler(environ, start_response, app):
log('ERROR: %s' % repr(e), force=True) log('ERROR: %s' % repr(e), force=True)
return [cgitb.html(sys.exc_info())] return [cgitb.html(sys.exc_info())]
@middleware
def cgi_encode(environ, start_response, app):
out = app(environ, start_response)
return [x if isinstance(x, bytes) else x.encode('utf-8') for x in out]
def cli_app(): def cli_app():
options = Options(filterOptions(parseOptions(sys.argv[1:-1]))) options = Options(filterOptions(parseOptions(sys.argv[1:-1])))
@ -663,6 +667,7 @@ def main():
app = cgi_app app = cgi_app
app = cgi_error_handler(app) app = cgi_error_handler(app)
app = cgi_encode(app)
wsgiref.handlers.CGIHandler().run(app) wsgiref.handlers.CGIHandler().run(app)
@ -682,6 +687,7 @@ def main():
app = cgi_app app = cgi_app
app = cgi_file_handler(app) app = cgi_file_handler(app)
app = cgi_error_handler(app) app = cgi_error_handler(app)
app = cgi_encode(app)
print('Serving http://localhost:%s/'%port) print('Serving http://localhost:%s/'%port)
httpd = wsgiref.simple_server.make_server('', port, app) httpd = wsgiref.simple_server.make_server('', port, app)