From 86cc31f52992fb9d11f92de6fd5496842fea2265 Mon Sep 17 00:00:00 2001 From: Andy Anderson Date: Wed, 19 Apr 2017 10:43:43 -0500 Subject: [PATCH] fix backwards compatibility of url_concat for args=None --- tornado/httputil.py | 2 ++ tornado/test/httputil_test.py | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/tornado/httputil.py b/tornado/httputil.py index dc206fc8c..818ea914c 100644 --- a/tornado/httputil.py +++ b/tornado/httputil.py @@ -603,6 +603,8 @@ def url_concat(url, args): >>> url_concat("http://example.com/foo?a=b", [("c", "d"), ("c", "d2")]) 'http://example.com/foo?a=b&c=d&c=d2' """ + if args is None: + return url parsed_url = urlparse(url) if isinstance(args, dict): parsed_query = parse_qsl(parsed_url.query, keep_blank_values=True) diff --git a/tornado/test/httputil_test.py b/tornado/test/httputil_test.py index 5249eadde..d1278567b 100644 --- a/tornado/test/httputil_test.py +++ b/tornado/test/httputil_test.py @@ -66,6 +66,13 @@ class TestUrlConcat(unittest.TestCase): ) self.assertEqual(url, "https://localhost/path?r=1&t=2") + def test_url_concat_none_params(self): + url = url_concat( + "https://localhost/path?r=1&t=2", + None, + ) + self.assertEqual(url, "https://localhost/path?r=1&t=2") + def test_url_concat_with_frag(self): url = url_concat( "https://localhost/path#tab", -- 2.47.2