From ba1e276e2f36022ced75b3b9ba1441727409f768 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Fri, 15 Aug 2014 14:23:25 -0700 Subject: [PATCH] misc fixes: ensure buffered response is an iterator (no need to explicitly check, check doesn't work in jython) query_handler: include check for '-' status code for revisits --- pywb/framework/wbrequestresponse.py | 5 +---- pywb/webapp/query_handler.py | 2 +- pywb/webapp/replay_views.py | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pywb/framework/wbrequestresponse.py b/pywb/framework/wbrequestresponse.py index a6f1908b..fad7b5a8 100644 --- a/pywb/framework/wbrequestresponse.py +++ b/pywb/framework/wbrequestresponse.py @@ -187,10 +187,7 @@ class WbResponse(object): self.body.close() return [] - if hasattr(self.body, '__iter__'): - return self.body - else: - return [str(self.body)] + return self.body def __repr__(self): return str(vars(self)) diff --git a/pywb/webapp/query_handler.py b/pywb/webapp/query_handler.py index b7d09ecb..92526179 100644 --- a/pywb/webapp/query_handler.py +++ b/pywb/webapp/query_handler.py @@ -144,7 +144,7 @@ class QueryHandler(object): wburl.LATEST_REPLAY: {'sort': 'reverse', - 'filter': ['statuscode:[23]..'], + 'filter': ['statuscode:[23]..|-'], 'limit': '1', 'resolveRevisits': True, } diff --git a/pywb/webapp/replay_views.py b/pywb/webapp/replay_views.py index 6572419f..42751a75 100644 --- a/pywb/webapp/replay_views.py +++ b/pywb/webapp/replay_views.py @@ -174,7 +174,7 @@ class ReplayView(object): content_length_str) out.close() - return content + return [content] def _redirect_if_needed(self, wbrequest, cdx): if wbrequest.options['is_proxy']: