From ccc13b427f4f0b52de95e1d8289dfa08e35cab92 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Sun, 2 Oct 2016 11:29:51 -0700 Subject: [PATCH] dockerfile: update to latest pywb urlrewrite: upstream url avoid adding empty '&' --- Dockerfile | 4 ++-- urlrewrite/rewriterapp.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 583665a7..39598278 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ FROM python:3.5.2 RUN pip install gevent uwsgi bottle urllib3 youtube-dl -#RUN pip install git+https://github.com/ikreymer/pywb.git@develop#egg=pywb-0.32.0 -RUN pip install pywb +RUN pip install git+https://github.com/ikreymer/pywb.git@develop#egg=pywb-0.32.2 +#RUN pip install pywb RUN pip install git+https://github.com/t0m/pyamf.git@python3 diff --git a/urlrewrite/rewriterapp.py b/urlrewrite/rewriterapp.py index 9bfb5b3d..cadd67ef 100644 --- a/urlrewrite/rewriterapp.py +++ b/urlrewrite/rewriterapp.py @@ -391,8 +391,9 @@ class RewriterApp(object): def get_upstream_url(self, wb_url, kwargs, params): base_url = self.get_base_url(wb_url, kwargs) - #params['filter'] = tuple(params['filter']) - base_url += '&' + urlencode(params, True) + param_str = urlencode(params, True) + if param_str: + base_url += '&' + param_str return base_url def get_cookie_key(self, kwargs):