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

html rewriter: attr rewrite ops check for empty/blank attr value, return empty string

Browse Source
This commit is contained in:
Ilya Kreymer 2016-06-12 01:50:55 -04:00
parent d2c37f7d91
commit 1bfec37970
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pywb/rewrite/html_rewriter.py
View File

@ -120,7 +120,7 @@ class HTMLRewriterMixin(object):
def _rewrite_meta_refresh(self, meta_refresh): def _rewrite_meta_refresh(self, meta_refresh):
if not meta_refresh: if not meta_refresh:
return None return ''
m = self.META_REFRESH_REGEX.match(meta_refresh) m = self.META_REFRESH_REGEX.match(meta_refresh)
if not m: if not m:
@ -133,6 +133,9 @@ class HTMLRewriterMixin(object):
return meta_refresh return meta_refresh
def _rewrite_base(self, url, mod=''): def _rewrite_base(self, url, mod=''):
if not url:
return ''
url = self._ensure_url_has_path(url) url = self._ensure_url_has_path(url)
base_url = self._rewrite_url(url, mod) base_url = self._rewrite_url(url, mod)
@ -183,11 +186,11 @@ class HTMLRewriterMixin(object):
def _rewrite_url(self, value, mod=None): def _rewrite_url(self, value, mod=None):
if not value: if not value:
return None return ''
value = value.strip() value = value.strip()
if not value: if not value:
return None return ''
value = self.try_unescape(value) value = self.try_unescape(value)
return self.url_rewriter.rewrite(value, mod) return self.url_rewriter.rewrite(value, mod)
@ -209,6 +212,9 @@ class HTMLRewriterMixin(object):
return new_value return new_value
def _rewrite_srcset(self, value, mod=''): def _rewrite_srcset(self, value, mod=''):
if not value:
return ''
values = value.split(',') values = value.split(',')
values = map(lambda x: self._rewrite_url(x.strip()), values) values = map(lambda x: self._rewrite_url(x.strip()), values)
return ', '.join(values) return ', '.join(values)
@ -217,13 +223,13 @@ class HTMLRewriterMixin(object):
if css_content: if css_content:
return self.css_rewriter.rewrite(css_content) return self.css_rewriter.rewrite(css_content)
else: else:
return None return ''
def _rewrite_script(self, script_content): def _rewrite_script(self, script_content):
if script_content: if script_content:
return self.js_rewriter.rewrite(script_content) return self.js_rewriter.rewrite(script_content)
else: else:
return None return ''
def has_attr(self, tag_attrs, attr): def has_attr(self, tag_attrs, attr):
name, value = attr name, value = attr