From 78bd89b4cbdd2dc1597355e3c495e0ee0784f273 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Wed, 11 Feb 2015 14:28:45 -0800 Subject: [PATCH] rewrite: simplify deprefix, url already unquoted now so remove extra unquote --- pywb/rewrite/test/test_url_rewriter.py | 3 --- pywb/rewrite/wburl.py | 1 - 2 files changed, 4 deletions(-) diff --git a/pywb/rewrite/test/test_url_rewriter.py b/pywb/rewrite/test/test_url_rewriter.py index a78a5529..b08d0015 100644 --- a/pywb/rewrite/test/test_url_rewriter.py +++ b/pywb/rewrite/test/test_url_rewriter.py @@ -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): - encoded = urllib.quote_plus(full_prefix) - url = url.replace(full_prefix, encoded) - rewriter = UrlRewriter(url, rel_prefix, full_prefix) url = rewriter.deprefix_url() return urllib.unquote_plus(url) diff --git a/pywb/rewrite/wburl.py b/pywb/rewrite/wburl.py index 859e9582..69c81ebb 100644 --- a/pywb/rewrite/wburl.py +++ b/pywb/rewrite/wburl.py @@ -244,7 +244,6 @@ class WbUrl(BaseWbUrl): self.type = self.REPLAY def deprefix_url(self, prefix): - prefix = urllib.quote_plus(prefix) rex_query = '=' + re.escape(prefix) + '([0-9])*([\w]{2}_)?/?' new_url = re.sub(rex_query, '=', self.url) self.url = new_url