Skip to content

Commit 181c18a

Browse files
ikreymerikreymer
committed
pep8 pass: fix spacing, line length, issues
also remove references to obsolete cached_replay, hostnames in pywb_init
1 parent 51919ed commit 181c18a

23 files changed

+75
-79
lines changed

‎pywb/cdx/cdxdomainspecific.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ def __call__(self, query):
106106
if inx > 0:
107107
url = url[:inx + 1]
108108

109-
110109
if matched_rule.match_type == 'domain':
111110
host = urlparse.urlsplit(url).netloc
112111
# remove the subdomain
@@ -174,8 +173,8 @@ def make_regex(config):
174173
@staticmethod
175174
def make_query_match_regex(params_list):
176175
r"""
177-
>>> CDXDomainSpecificRule.make_query_match_regex(['param1', 'id', 'abc'])
178-
'[?&](abc=[^&]+).*[?&](id=[^&]+).*[?&](param1=[^&]+)'
176+
>>> CDXDomainSpecificRule.make_query_match_regex(['para', 'id', 'abc'])
177+
'[?&](abc=[^&]+).*[?&](id=[^&]+).*[?&](para=[^&]+)'
179178
180179
>>> CDXDomainSpecificRule.make_query_match_regex(['id[0]', 'abc()'])
181180
'[?&](abc\\(\\)=[^&]+).*[?&](id\\[0\\]=[^&]+)'

‎pywb/cdx/cdxobject.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class CDXObject(OrderedDict):
4444
["urlkey", "timestamp", "original", "mimetype", "statuscode",
4545
"digest", "redirect", "offset", "filename",
4646
"orig.length", "orig.offset", "orig.filename"]
47-
]
47+
]
4848

4949
def __init__(self, cdxline=''):
5050
OrderedDict.__init__(self)

‎pywb/cdx/cdxops.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ def __init__(self, string):
169169
# no field set, apply filter to entire cdx
170170
if len(parts) == 1:
171171
self.field = ''
172-
else:
173172
# apply filter to cdx[field]
173+
else:
174174
self.field = parts[0]
175175
string = parts[1]
176176

‎pywb/framework/certauth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ def main(args=None):
194194
help=('use specified root cert (.pem file) ' +
195195
'to create signed cert'))
196196

197-
parser.add_argument('-n', '--name', action='store', default=CERT_NAME,
197+
parser.add_argument('-n', '--name', action='store', default=CERT_NAME,
198198
help='name for root certificate')
199199

200200
parser.add_argument('-d', '--certs-dir', default=CERTS_DIR)

‎pywb/framework/proxy.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def __call__(self, env):
159159
if env['pywb.proxy_host'] == self.magic_name:
160160
env['REL_REQUEST_URI'] = env['pywb.proxy_req_uri']
161161

162-
# special case for proxy install
162+
# special case for proxy install
163163
response = self.handle_cert_install(env)
164164
if response:
165165
return response
@@ -307,7 +307,7 @@ def handle_connect(self, env):
307307

308308
name = name.replace('-', '_').upper()
309309

310-
if not name in ('CONTENT_LENGTH', 'CONTENT_TYPE'):
310+
if name not in ('CONTENT_LENGTH', 'CONTENT_TYPE'):
311311
name = 'HTTP_' + name
312312

313313
env[name] = value

‎pywb/framework/wbrequestresponse.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ def __init__(self, env,
8383
rewrite_opts)
8484

8585
self.urlrewriter.deprefix_url()
86-
else:
8786
# no wb_url, just store blank wb_url
87+
else:
8888
self.wb_url = None
8989
self.urlrewriter = None
9090

@@ -113,6 +113,7 @@ def _is_ajax(self):
113113
return False
114114

115115
RANGE_ARG_RX = re.compile('.*.googlevideo.com/videoplayback.*([&?]range=(\d+)-(\d+))')
116+
116117
RANGE_HEADER = re.compile('bytes=(\d+)-(\d+)?')
117118

118119
def extract_range(self):

‎pywb/rewrite/cookie_rewriter.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ def rewrite_cookie(self, name, morsel):
7373

7474
self._remove_age_opts(morsel)
7575
return morsel
76+
77+
7678
#=================================================================
7779
class RootScopeCookieRewriter(WbUrlBaseCookieRewriter):
7880
"""

‎pywb/rewrite/header_rewriter.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ class HeaderRewriter:
3333
'xml': ['/xml', '+xml', '.xml', '.rss'],
3434
}
3535

36-
PROXY_HEADERS = ['content-type', 'content-disposition', 'content-range', 'accept-ranges']
36+
PROXY_HEADERS = ['content-type', 'content-disposition', 'content-range',
37+
'accept-ranges']
3738

3839
URL_REWRITE_HEADERS = ['location', 'content-location', 'content-base']
3940

‎pywb/rewrite/html_rewriter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def _rewrite_tag_attrs(self, tag, tag_attrs):
172172

173173
# special case: inline JS/event handler
174174
if ((attr_value and attr_value.startswith('javascript:'))
175-
or attr_name.startswith('on')):
175+
or attr_name.startswith('on')):
176176
attr_value = self._rewrite_script(attr_value)
177177

178178
# special case: inline CSS/style attribute
@@ -193,7 +193,7 @@ def _rewrite_tag_attrs(self, tag, tag_attrs):
193193
# don't rewrite rel=canonical
194194
elif tag == 'link' and attr_name == 'href':
195195
if (self.opts.get('rewrite_rel_canon', True) or
196-
not self.has_attr(tag_attrs, ('rel', 'canonical'))):
196+
not self.has_attr(tag_attrs, ('rel', 'canonical'))):
197197
rw_mod = handler.get(attr_name)
198198
attr_value = self._rewrite_url(attr_value, rw_mod)
199199

‎pywb/rewrite/regex_rewriters.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -123,31 +123,30 @@ def __init__(self, rewriter, rules=[]):
123123

124124
#=================================================================
125125
class JSLocationRewriterMixin(object):
126-
#class JSLinkAndLocationRewriter(JSLinkOnlyRewriter):
127126
"""
128127
JS Rewriter mixin which rewrites location and domain to the
129128
specified prefix (default: 'WB_wombat_')
130129
"""
131130

132131
def __init__(self, rewriter, rules=[], prefix='WB_wombat_'):
133132
rules = rules + [
134-
(r'(?<![/$])\blocation\b(?!\":)', RegexRewriter.add_prefix(prefix), 0),
135-
(r'(?<=document\.)domain', RegexRewriter.add_prefix(prefix), 0),
136-
(r'(?<=document\.)referrer', RegexRewriter.add_prefix(prefix), 0),
137-
(r'(?<=document\.)cookie', RegexRewriter.add_prefix(prefix), 0),
133+
(r'(?<![/$])\blocation\b(?!\":)', RegexRewriter.add_prefix(prefix), 0),
134+
(r'(?<=document\.)domain', RegexRewriter.add_prefix(prefix), 0),
135+
(r'(?<=document\.)referrer', RegexRewriter.add_prefix(prefix), 0),
136+
(r'(?<=document\.)cookie', RegexRewriter.add_prefix(prefix), 0),
138137

139138
#todo: move to mixin?
140-
(r'(?:[\s=(){]|^)(top)(?:[\s!=}()]|$)',
141-
RegexRewriter.add_prefix(prefix), 1),
139+
(r'(?:[\s=(){]|^)(top)(?:[\s!=}()]|$)',
140+
RegexRewriter.add_prefix(prefix), 1),
142141

143-
(r'(?<=window\.)top',
144-
RegexRewriter.add_prefix(prefix), 0),
142+
(r'(?<=window\.)top',
143+
RegexRewriter.add_prefix(prefix), 0),
145144

146-
# (r'\b(top)\b[!=\W]+(?:self|window)',
147-
# RegexRewriter.add_prefix(prefix), 1),
145+
# (r'\b(top)\b[!=\W]+(?:self|window)',
146+
# RegexRewriter.add_prefix(prefix), 1),
148147

149-
#(r'\b(?:self|window)\b[!=\W]+\b(top)\b',
150-
#RegexRewriter.add_prefix(prefix), 1),
148+
#(r'\b(?:self|window)\b[!=\W]+\b(top)\b',
149+
#RegexRewriter.add_prefix(prefix), 1),
151150
]
152151
super(JSLocationRewriterMixin, self).__init__(rewriter, rules)
153152

@@ -161,6 +160,7 @@ class JSLocationOnlyRewriter(JSLocationRewriterMixin, RegexRewriter):
161160
class JSLinkOnlyRewriter(JSLinkRewriterMixin, RegexRewriter):
162161
pass
163162

163+
164164
#=================================================================
165165
class JSLinkAndLocationRewriter(JSLocationRewriterMixin,
166166
JSLinkRewriterMixin,
@@ -190,9 +190,9 @@ def filter(self, m):
190190

191191
def _create_rules(self, rewriter):
192192
return [
193-
('([A-Za-z:]+[\s=]+)?["\'\s]*(' +
194-
RegexRewriter.HTTPX_MATCH_STR + ')',
195-
RegexRewriter.archival_rewrite(rewriter), 2),
193+
('([A-Za-z:]+[\s=]+)?["\'\s]*(' +
194+
RegexRewriter.HTTPX_MATCH_STR + ')',
195+
RegexRewriter.archival_rewrite(rewriter), 2),
196196
]
197197

198198

@@ -210,9 +210,9 @@ def __init__(self, rewriter):
210210

211211
def _create_rules(self, rewriter):
212212
return [
213-
(CSSRewriter.CSS_URL_REGEX,
214-
RegexRewriter.archival_rewrite(rewriter), 1),
213+
(CSSRewriter.CSS_URL_REGEX,
214+
RegexRewriter.archival_rewrite(rewriter), 1),
215215

216-
(CSSRewriter.CSS_IMPORT_NO_URL_REGEX,
217-
RegexRewriter.archival_rewrite(rewriter), 1),
216+
(CSSRewriter.CSS_IMPORT_NO_URL_REGEX,
217+
RegexRewriter.archival_rewrite(rewriter), 1),
218218
]

0 commit comments

Comments
 (0)