backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-24 06:59:52 +01:00
Code Issues Projects Releases Activity

render_response has option to pass in statuscode

Browse Source
This commit is contained in:
Ilya Kreymer 2014-01-31 19:45:01 -08:00
parent 44ef14b022
commit 6d2c8286ca
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pywb/views.py
View File

@ -44,7 +44,8 @@ class J2TemplateView:
def render_response(self, **kwargs): def render_response(self, **kwargs):
template_result = self.render_to_string(**kwargs) template_result = self.render_to_string(**kwargs)
return wbrequestresponse.WbResponse.text_response(str(template_result), content_type = 'text/html; charset=utf-8') status = kwargs.get('status', '200 OK')
return wbrequestresponse.WbResponse.text_response(str(template_result), status = status, content_type = 'text/html; charset=utf-8')
# Filters # Filters
@ -74,7 +75,12 @@ class J2HtmlCapturesView(J2TemplateView):
#================================================================= #=================================================================
class TextCapturesView: class TextCapturesView:
def render_response(self, wbrequest, cdx_lines): def render_response(self, wbrequest, cdx_lines):
cdx_lines = imap(lambda x: str(x) + '\n', cdx_lines) def to_str(cdx):
cdx = str(cdx)
if not cdx.endswith('\n'):
cdx += '\n'
return cdx
cdx_lines = imap(to_str, cdx_lines)
return wbrequestresponse.WbResponse.text_stream(cdx_lines) return wbrequestresponse.WbResponse.text_stream(cdx_lines)

6
pywb/wbapp.py
View File

@ -59,7 +59,7 @@ def handle_exception(env, errorpage, exc, print_trace):
if errorpage: if errorpage:
import traceback import traceback
return errorpage.render_response(err_msg = str(exc), err_details = err_details) return errorpage.render_response(err_msg = str(exc), err_details = err_details, status = status)
else: else:
return WbResponse.text_response(status + ' Error: ' + str(exc), status = status) return WbResponse.text_response(status + ' Error: ' + str(exc), status = status)
@ -69,12 +69,13 @@ DEFAULT_CONFIG_FILE = 'config.yaml'
def main(): def main():
try: try:
# Attempt to load real settings from globalwb module
logging.basicConfig(format = '%(asctime)s: [%(levelname)s]: %(message)s', level = logging.DEBUG) logging.basicConfig(format = '%(asctime)s: [%(levelname)s]: %(message)s', level = logging.DEBUG)
# see if there's a custom init module
config_name = os.environ.get('PYWB_CONFIG_MODULE') config_name = os.environ.get('PYWB_CONFIG_MODULE')
if not config_name: if not config_name:
# use default module
config_name = 'pywb.pywb_init' config_name = 'pywb.pywb_init'
logging.info('Loading from default config module "{0}"'.format(config_name)) logging.info('Loading from default config module "{0}"'.format(config_name))
logging.info('') logging.info('')
@ -87,7 +88,6 @@ def main():
return app return app
except Exception as e: except Exception as e:
# Otherwise, start with the sample settings
logging.exception('*** pywb could not init with settings from {0}.pywb_config()!\n'.format(config_name)) logging.exception('*** pywb could not init with settings from {0}.pywb_config()!\n'.format(config_name))
raise e raise e