mirror of
https://github.com/webrecorder/pywb.git
synced 2025-03-24 06:59:52 +01:00
rewrite: simplify deprefix, url already unquoted now so remove extra unquote
This commit is contained in:
parent
4e7f95081f
commit
78bd89b4cb
@ -126,9 +126,6 @@ def do_rewrite(rel_url, base_url, prefix, mod=None, full_prefix=None):
|
|||||||
|
|
||||||
|
|
||||||
def do_deprefix(url, rel_prefix, full_prefix):
|
def do_deprefix(url, rel_prefix, full_prefix):
|
||||||
encoded = urllib.quote_plus(full_prefix)
|
|
||||||
url = url.replace(full_prefix, encoded)
|
|
||||||
|
|
||||||
rewriter = UrlRewriter(url, rel_prefix, full_prefix)
|
rewriter = UrlRewriter(url, rel_prefix, full_prefix)
|
||||||
url = rewriter.deprefix_url()
|
url = rewriter.deprefix_url()
|
||||||
return urllib.unquote_plus(url)
|
return urllib.unquote_plus(url)
|
||||||
|
@ -244,7 +244,6 @@ class WbUrl(BaseWbUrl):
|
|||||||
self.type = self.REPLAY
|
self.type = self.REPLAY
|
||||||
|
|
||||||
def deprefix_url(self, prefix):
|
def deprefix_url(self, prefix):
|
||||||
prefix = urllib.quote_plus(prefix)
|
|
||||||
rex_query = '=' + re.escape(prefix) + '([0-9])*([\w]{2}_)?/?'
|
rex_query = '=' + re.escape(prefix) + '([0-9])*([\w]{2}_)?/?'
|
||||||
new_url = re.sub(rex_query, '=', self.url)
|
new_url = re.sub(rex_query, '=', self.url)
|
||||||
self.url = new_url
|
self.url = new_url
|
||||||
|
Loading…
x
Reference in New Issue
Block a user