diff --git a/pywb/cdx/cdxdomainspecific.py b/pywb/cdx/cdxdomainspecific.py index 914bf770..ce15e024 100644 --- a/pywb/cdx/cdxdomainspecific.py +++ b/pywb/cdx/cdxdomainspecific.py @@ -168,6 +168,7 @@ class CDXDomainSpecificRule(BaseRule): """ params_list.sort() + def conv(value): return '[?&]({0}=[^&]+)'.format(re.escape(value)) diff --git a/pywb/cdx/cdxserver.py b/pywb/cdx/cdxserver.py index b5a5745e..1ecec407 100644 --- a/pywb/cdx/cdxserver.py +++ b/pywb/cdx/cdxserver.py @@ -155,10 +155,10 @@ class CDXServer(BaseCDXServer): if os.path.isdir(source): for fn in os.listdir(source): self._add_cdx_source(self._create_cdx_source( - os.path.join(source, fn), config)) + os.path.join(source, fn), config)) else: self._add_cdx_source(self._create_cdx_source( - source, config)) + source, config)) def _create_cdx_source(self, filename, config): if is_http(filename): diff --git a/pywb/framework/memento.py b/pywb/framework/memento.py index e801fe3e..1fd2069c 100644 --- a/pywb/framework/memento.py +++ b/pywb/framework/memento.py @@ -48,7 +48,8 @@ class MementoRespMixin(object): is_top_frame = wbrequest.wb_url.is_top_frame - is_timegate = wbrequest.options.get('is_timegate', False) and not is_top_frame + is_timegate = (wbrequest.options.get('is_timegate', False) and + not is_top_frame) if is_timegate: self.status_headers.headers.append(('Vary', 'accept-datetime')) @@ -72,7 +73,7 @@ class MementoRespMixin(object): is_memento = (wbrequest.wb_url.type == wbrequest.wb_url.REPLAY) link = [] - + if is_memento and cdx: http_date = timestamp_to_http_date(cdx['timestamp']) self.status_headers.headers.append(('Memento-Datetime', http_date)) diff --git a/pywb/rewrite/regex_rewriters.py b/pywb/rewrite/regex_rewriters.py index 51267a61..544e12e9 100644 --- a/pywb/rewrite/regex_rewriters.py +++ b/pywb/rewrite/regex_rewriters.py @@ -100,7 +100,7 @@ class RegexRewriter(object): group = obj.get('group', 0) result = (match, replace, group) return result - + return map(parse_rule, config) return run_parse_rules diff --git a/pywb/rewrite/rewrite_content.py b/pywb/rewrite/rewrite_content.py index 029dde28..fe3090d3 100644 --- a/pywb/rewrite/rewrite_content.py +++ b/pywb/rewrite/rewrite_content.py @@ -39,7 +39,8 @@ class RewriteContent: return (status_headers, stream) - def _rewrite_headers(self, urlrewriter, rule, status_headers, stream, urlkey=''): + def _rewrite_headers(self, urlrewriter, rule, status_headers, stream, + urlkey=''): header_rewriter_class = rule.rewriters['header'] @@ -49,7 +50,9 @@ class RewriteContent: cookie_rewriter = urlrewriter.get_cookie_rewriter(rule) rewritten_headers = (header_rewriter_class(). - rewrite(status_headers, urlrewriter, cookie_rewriter)) + rewrite(status_headers, + urlrewriter, + cookie_rewriter)) # note: since chunk encoding may/may not be valid, # the approach taken here is to *always* attempt diff --git a/pywb/rewrite/url_rewriter.py b/pywb/rewrite/url_rewriter.py index 2ea0889c..5fc3a18e 100644 --- a/pywb/rewrite/url_rewriter.py +++ b/pywb/rewrite/url_rewriter.py @@ -18,8 +18,8 @@ class UrlRewriter(object): PROTOCOLS = ['http:', 'https:', 'ftp:', 'mms:', 'rtsp:', 'wais:'] - def __init__(self, wburl, prefix, full_prefix=None, rel_prefix=None, root_path=None, - cookie_scope=None): + def __init__(self, wburl, prefix, full_prefix=None, rel_prefix=None, + root_path=None, cookie_scope=None): self.wburl = wburl if isinstance(wburl, WbUrl) else WbUrl(wburl) self.prefix = prefix self.full_prefix = full_prefix diff --git a/pywb/rewrite/wburl.py b/pywb/rewrite/wburl.py index cd5a2518..de789ac0 100644 --- a/pywb/rewrite/wburl.py +++ b/pywb/rewrite/wburl.py @@ -188,11 +188,6 @@ class WbUrl(BaseWbUrl): else: return url - @property - def is_mainpage(self): - return (not self.mod or - self.mod == 'mp_') - @property def is_top_frame(self): return (self.mod == 'tf_') diff --git a/pywb/utils/binsearch.py b/pywb/utils/binsearch.py index 4e3b506c..cf4ad986 100644 --- a/pywb/utils/binsearch.py +++ b/pywb/utils/binsearch.py @@ -116,8 +116,8 @@ def iter_range(reader, start, end, prev_size=0): iter_ = search(reader, start, prev_size=prev_size) end_iter = itertools.takewhile( - lambda line: line < end, - iter_) + lambda line: line < end, + iter_) return end_iter diff --git a/pywb/utils/loaders.py b/pywb/utils/loaders.py index 0e9e3fda..d54f4908 100644 --- a/pywb/utils/loaders.py +++ b/pywb/utils/loaders.py @@ -35,8 +35,8 @@ def extract_post_query(method, mime, length, stream): if method.upper() != 'POST': return None - if (not mime or - not mime.lower().startswith('application/x-www-form-urlencoded')): + if ((not mime or + not mime.lower().startswith('application/x-www-form-urlencoded'))): return None if not length or length == '0': diff --git a/pywb/webapp/views.py b/pywb/webapp/views.py index b1eacfcc..11e78618 100644 --- a/pywb/webapp/views.py +++ b/pywb/webapp/views.py @@ -79,7 +79,7 @@ class J2TemplateView(object): def make_jinja_env(self, template_dir): loaders = self._make_loaders(template_dir) loader = ChoiceLoader(loaders) - + jinja_env = Environment(loader=loader, trim_blocks=True) jinja_env.filters.update(FILTERS) jinja_env.globals.update(self.env_globals) @@ -91,7 +91,8 @@ class J2TemplateView(object): # add relative and absolute path loaders for banner support loaders.append(FileSystemLoader('.')) loaders.append(FileSystemLoader('/')) - loaders.append(PackageLoader(self.env_globals['package'], template_dir)) + loaders.append(PackageLoader(self.env_globals['package'], + template_dir)) return loaders def render_to_string(self, **kwargs):