1
0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-24 15:09:54 +01:00

pep8 style fixes, remove unused methods

This commit is contained in:
Ilya Kreymer 2014-10-21 19:06:16 -07:00
parent 1a78fffa22
commit e8d3965269
10 changed files with 21 additions and 20 deletions

View File

@ -168,6 +168,7 @@ class CDXDomainSpecificRule(BaseRule):
"""
params_list.sort()
def conv(value):
return '[?&]({0}=[^&]+)'.format(re.escape(value))

View File

@ -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):

View File

@ -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'))

View File

@ -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

View File

@ -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

View File

@ -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_')

View File

@ -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

View File

@ -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':

View File

@ -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):