From 11d0ced5303bae75557dcb03e7d5175f4c5036b4 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 7 Jan 2019 12:41:46 +0100 Subject: [PATCH 1/2] utils: ignore URL parameters with a None value (#29242) --- src/authentic2/utils.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/authentic2/utils.py b/src/authentic2/utils.py index 1ff7e89d..33a1dff3 100644 --- a/src/authentic2/utils.py +++ b/src/authentic2/utils.py @@ -284,13 +284,17 @@ def make_url(to, args=(), kwargs={}, keep_params=False, params=None, append=None url_params.setlist(key, request.GET.getlist(key)) if params: for key, value in params.iteritems(): - if isinstance(value, (tuple, list)): + if value is None: + url_params.pop(key, None) + elif isinstance(value, (tuple, list)): url_params.setlist(key, value) else: url_params[key] = value if append: for key, value in append.iteritems(): - if isinstance(value, (tuple, list)): + if value is None: + continue + elif isinstance(value, (tuple, list)): url_params.extend({key: value}) else: url_params.appendlist(key, value) -- 2.18.0