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

morss: fix cgi in python 3 

Needs explicit [] in py3
master
pictuga 2017-11-04 12:27:47 +01:00
parent a8c2df7f41
commit 2d7d0fcdca
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
morss/morss.py
View File

@ -592,23 +592,23 @@ def cgi_wrapper(environ, start_response):
headers['status'] = '200 OK' headers['status'] = '200 OK'
headers['content-type'] = files[url] headers['content-type'] = files[url]
start_response(headers['status'], list(headers.items())) start_response(headers['status'], list(headers.items()))
return body return [body]
except IOError: except IOError:
headers['status'] = '404 Not found' headers['status'] = '404 Not found'
start_response(headers['status'], list(headers.items())) start_response(headers['status'], list(headers.items()))
return 'Error %s' % headers['status'] return ['Error %s' % headers['status']]
# actual morss use # actual morss use
try: try:
return cgi_app(environ, start_response) or [] return [cgi_app(environ, start_response)] or []
except (KeyboardInterrupt, SystemExit): except (KeyboardInterrupt, SystemExit):
raise raise
except Exception as e: except Exception as e:
headers = {'status': '500 Oops', 'content-type': 'text/plain'} headers = {'status': '500 Oops', 'content-type': 'text/plain'}
start_response(headers['status'], list(headers.items()), sys.exc_info()) start_response(headers['status'], list(headers.items()), sys.exc_info())
log('ERROR <%s>: %s' % (url, e.message), force=True) log('ERROR <%s>: %s' % (url, e.message), force=True)
return 'An error happened:\n%s' % e.message return ['An error happened:\n%s' % e.message]
def cli_app(): def cli_app():