fresco 3.6.0__py3-none-any.whl → 3.7.0__py3-none-any.whl

fresco/__init__.py

@@ -68,7 +68,7 @@ from fresco.subrequests import subrequest_raw
 from fresco.util.common import object_or_404
 
 
-__version__ = "3.6.0"
+__version__ = "3.7.0"
 __all__ = [
     "Request",
     "currentrequest",

fresco/tests/util/test_urls.py

@@ -15,6 +15,7 @@
 from fresco.core import FrescoApp
 from fresco.util.urls import normpath, make_query
 from fresco.util.urls import is_safe_url
+from fresco.util.urls import add_query
 
 # Greek letters as unicode strings (require multi-byte representation in UTF-8)
 alpha = b"\xce\xb1".decode("utf8")
@@ -174,3 +175,22 @@ class TestSafeURL(object):
         ]
         for u in unsafe:
             assert is_safe_url(u, allowed_hosts={"good.example.org"}) is False
+
+
+class TestAddQuery:
+
+    def test_it_adds_query(self):
+        url = add_query("http://localhost", {"foo": "bar"})
+        assert url == "http://localhost?foo=bar"
+
+    def test_it_adds_query_from_list(self):
+        url = add_query("http://localhost", [("foo", "bar")])
+        assert url == "http://localhost?foo=bar"
+
+    def test_it_adds_query_from_keywords(self):
+        url = add_query("http://localhost", foo="bar")
+        assert url == "http://localhost?foo=bar"
+
+    def test_it_appends_query(self):
+        url = add_query("http://localhost?foo=bar", {"foo": "baz"})
+        assert url == "http://localhost?foo=bar&foo=baz"

fresco/util/urls.py

@@ -23,6 +23,8 @@ from typing import List
 from urllib.parse import quote_plus
 from urllib.parse import urlparse
 from urllib.parse import urlunparse
+from urllib.parse import urlencode
+from urllib.parse import parse_qsl
 import posixpath
 import re
 import typing as t
@@ -31,7 +33,7 @@ from fresco.defaults import DEFAULT_CHARSET
 from fresco.multidict import MultiDict
 from fresco.types import QuerySpec
 
-__all__ = "join_path", "url_join", "strip_trailing_slashes", "normpath"
+__all__ = "join_path", "url_join", "strip_trailing_slashes", "normpath", "add_query"
 
 
 def join_path(a, b):
@@ -329,3 +331,31 @@ def is_safe_url(
         or (scheme == "" and netloc == "")
         or (scheme == "" and netloc in allowed_hosts)
     )
+
+
+def add_query(
+    url: str,
+    data: t.Union[t.Sequence[tuple[str, t.Any]], t.Mapping[str, t.Any]] = [],
+    **kwargs: t.Any,
+) -> str:
+    """
+    Return the given URL with the given query data appended
+
+    :param url:
+        The base URL
+    :param data:
+        Optional data items, supplied either as a mapping or list of (key,
+        value) tuples
+    :param kwargs:
+        Query data supplied as keyword arguments
+    """
+    parsed = urlparse(url)
+    return urlunparse(
+        parsed._replace(
+            query=urlencode(
+                parse_qsl(parsed.query)
+                + list(dict(data).items())
+                + list(kwargs.items())
+            )
+        )
+    )

{fresco-3.6.0.dist-info → fresco-3.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fresco
-Version: 3.6.0
+Version: 3.7.0
 Summary: A Web/WSGI micro-framework
 Author-email: Oliver Cope <oliver@redgecko.org>
 License: Apache

{fresco-3.6.0.dist-info → fresco-3.7.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fresco/__init__.py,sha256=02YPwizUXGa9L8OrpfoX9edVv6ISiCdIOyqR0LvYYWA,3537
+fresco/__init__.py,sha256=Jo5gW2Xce2hmtXhfaXXJR4aBW1KFYb0Murx2JfIo_E8,3537
 fresco/cookie.py,sha256=Qnx8yOjU4LUJ1fqi7YvqbhAA01rCsclJGl_fxI68slw,7055
 fresco/core.py,sha256=bqGDgm4OH46j6HqnC5nJyn9n1dQw-I1ntUY8dIpeO_M,26988
 fresco/decorators.py,sha256=JL4MlsJz4RWRAuOCCB3fx3rtd-E1CvwO2MD7bf94yHM,3324
@@ -37,7 +37,7 @@ fresco/tests/util/form_data.py,sha256=TalOuv4BGM3JNrf14tE47o9wAwZ7jA1CvRDnGJFifn
 fresco/tests/util/test_common.py,sha256=NvKX8KIAUki7b2kDLILWqARbOQmR3XyInLlbcwFEhiU,1117
 fresco/tests/util/test_http.py,sha256=mdHDc-4m9sMNkEgHToIsgFuSSXQzNUcYSehPehYvJYo,10748
 fresco/tests/util/test_security.py,sha256=MtpDDKyDhAeRT766Lt3peOv4Jj55TM1lvJk1_5TKaes,1492
-fresco/tests/util/test_urls.py,sha256=xKiE6oq0bB-9u8kNYlMQmeCwuAKr1KLQovB-i24wKVQ,7643
+fresco/tests/util/test_urls.py,sha256=U12T9MlP7zCpf-ufoyaZI5nAswi0xCSBOxHjHB2K_0I,8320
 fresco/tests/util/test_wsgi.py,sha256=VsHUCo8yck_40nsYm-H-M0R8QYEE8JcboeGPbcrzsO0,3038
 fresco/util/__init__.py,sha256=mJkaZzvYgBnxsBAGv8y_P1yzonHqWgw6VF2Zs4rmJEA,7
 fresco/util/cache.py,sha256=0xINmBecCYo3h5-zU_yRyJeWmROygE3pO9w9Y3ZONcs,1661
@@ -49,10 +49,10 @@ fresco/util/io.py,sha256=xxwDNJOcewY8lAR4Ce3cmB_zlrys8JGsESgwGWE198Y,1289
 fresco/util/object.py,sha256=FjYNfPHzvBqq1rn0Y6As-2AVZ_SZOjH-lrSy4EbYmHY,370
 fresco/util/security.py,sha256=nXEdoCak_2c4OA1L1wGwhZygS22s2fzwR0Kp-DdwKZg,1058
 fresco/util/textproc.py,sha256=e5jLTofKCqdm6_Fy8XOyR43AJr5APtL59Kd8cNA9PrQ,2309
-fresco/util/urls.py,sha256=2vDbfmjBLtUVpZ0ZhoNWkzn2WVZxcZZQeBZjtcUDp3w,9276
+fresco/util/urls.py,sha256=V6-s2WgeARkEcuzpwqtiM8ebOXe5-mNUKOJ8N9LNBHA,10051
 fresco/util/wsgi.py,sha256=RYw4KeOUjzzPOL_HhEtgLyCngofjMdAT8BTLOSKU6KA,13021
-fresco-3.6.0.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-fresco-3.6.0.dist-info/METADATA,sha256=zfjV8OUXV-2-dRpwNilk8cgduTx8ZUq8dw_IcClwnuQ,1571
-fresco-3.6.0.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
-fresco-3.6.0.dist-info/top_level.txt,sha256=p_1aMce5Shjq9fIfdbB-aN8wCDhjF_iYnn98bUebbII,7
-fresco-3.6.0.dist-info/RECORD,,
+fresco-3.7.0.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+fresco-3.7.0.dist-info/METADATA,sha256=bqLRh85Q1K4S3Orlpyl-1vUXemvnWGrx1Y-qKtymOI0,1571
+fresco-3.7.0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+fresco-3.7.0.dist-info/top_level.txt,sha256=p_1aMce5Shjq9fIfdbB-aN8wCDhjF_iYnn98bUebbII,7
+fresco-3.7.0.dist-info/RECORD,,

{fresco-3.6.0.dist-info → fresco-3.7.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any