Merge branch 'master' of github.com:aio-libs/yarl

Author: asvetlov

CHANGES.rst

@@ -1,7 +1,7 @@
 CHANGES
 =======
 
-0.19.0 (xxxx-xx-xx)
+1.0.0 (xxxx-xx-xx)
 -------------------
 
 * Use fast path if quoted string does not need requoting (#154)
@@ -17,6 +17,8 @@ CHANGES
 
 * Support `encoded=True` in `yarl.URL.build()` (#158)
 
+* Fix updating query with multiple keys (#160)
+
 0.18.0 (2018-01-10)
 -------------------
 

docs/api.rst

@@ -566,22 +566,14 @@ section generates a new *URL* instance.
       URL('http://example.com/path?a=b&b=2')
       >>> URL('http://example.com/path?a=b&b=1').update_query([('b', '2')])
       URL('http://example.com/path?a=b&b=2')
+      >>> URL('http://example.com/path?a=b&c=e&c=f').update_query(c='d')
+      URL('http://example.com/path?a=b&c=d')
+      >>> URL('http://example.com/path?a=b').update_query('c=d&c=f')
+      URL('http://example.com/path?a=b&c=d&c=f')
 
-   .. note::
-
-      Query string will be updated in a similar way to ``dict.update``. Multiple values will be dropped:
-
-      .. doctest::
-
-         >>> URL('http://example.com/path?a=b&c=e&c=f').update_query(c='d')
-         URL('http://example.com/path?a=b&c=d')
-
-      When passing multiple values as an argument, only last value will be applied.
-
-      .. doctest::
+   .. versionchanged:: 1.0
 
-         >>> URL('http://example.com/path?a=b').update_query('c=d&c=f')
-         URL('http://example.com/path?a=b&c=f')
+      All multiple key/value pairs are applied to the multi-dictionary.
 
 .. method:: URL.with_fragment(port)
 

requirements/wheel.txt

@@ -1,2 +1,3 @@
 cython==0.27.3
 pytest==3.3.2
+multidict==4.0.0

tests/test_update_query.py

@@ -23,7 +23,7 @@ def test_update_query():
 
     assert url.update_query({'baz': 'foo'}) == expected_url
     assert url.update_query(baz='foo') == expected_url
-    assert url.update_query("?baz=foo") == expected_url
+    assert url.update_query("baz=foo") == expected_url
 
 
 def test_update_query_with_args_and_kwargs():
@@ -167,3 +167,10 @@ def test_with_query_only():
     url = URL()
     url2 = url.with_query(key='value')
     assert str(url2) == '?key=value'
+
+
+def test_update_query_multiple_keys():
+    url = URL('http://example.com/path?a=1&a=2')
+    u2 = url.update_query([('a', '3'), ('a', '4')])
+
+    assert str(u2) == 'http://example.com/path?a=3&a=4'

yarl/__init__.py

@@ -1,5 +1,4 @@
 import warnings
-from collections import OrderedDict
 from collections.abc import Mapping, Sequence
 from ipaddress import ip_address
 from urllib.parse import (SplitResult, parse_qsl,
@@ -853,19 +852,13 @@ def with_query(self, *args, **kwargs):
 
     def update_query(self, *args, **kwargs):
         """Return a new URL with query part updated."""
-        new_query = OrderedDict(
-            map(
-                lambda x: x.split('=', 1),
-                self._QUERY_QUOTER(
-                    self._get_str_query(*args, **kwargs)
-                ).lstrip("?").split("&")
-            )
-        )
-        query = OrderedDict(self.query)
+        s = self._get_str_query(*args, **kwargs)
+        new_query = MultiDict(parse_qsl(s, keep_blank_values=True))
+        query = MultiDict(self.query)
         query.update(new_query)
-        query = self._get_str_query(query)
-        return URL(
-            self._val._replace(path=self._val.path, query=query), encoded=True)
+
+        return URL(self._val._replace(query=self._get_str_query(query)),
+                   encoded=True)
 
     def with_fragment(self, fragment):
         """Return a new URL with fragment replaced.