fresco 3.7.0__py3-none-any.whl → 3.9.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.7.0"
+__version__ = "3.9.0"
 __all__ = [
     "Request",
     "currentrequest",

fresco/core.py

@@ -280,7 +280,9 @@ class FrescoApp(RouteCollection):
         except ResponseException as e:
             response = e.response
         else:
-            response = self.get_response(request, path, request.method)
+            response = self.get_response(
+                request, path, request.environ["REQUEST_METHOD"]
+            )
 
         for f in self.process_response_handlers:
             try:

fresco/options.py

@@ -285,11 +285,15 @@ class Options(dict):
                         )
                     )
 
-            if strict and existing_keys and set(self.keys()) != existing_keys:
-                raise AssertionError(
+            if existing_keys and set(self.keys()) != existing_keys:
+                error_msg = (
                     f"settings file {path} created undefined options: "
                     f"{set(self.keys()) - existing_keys}"
                 )
+                if strict:
+                    raise AssertionError(error_msg)
+                else:
+                    logger.warning(error_msg)
 
             if use_environ:
                 self |= {

fresco/request.py

@@ -195,7 +195,7 @@ class Request(object):
                 "Payload contains data that could not be decoded using " + encoding
             )
 
-    def get_json(self, *args, **kwargs):
+    def get_json(self, *args, **kwargs) -> t.Any:
         """
         Return a decoded JSON request body.
 
@@ -213,7 +213,7 @@ class Request(object):
             raise exceptions.RequestParseError("Payload is not valid JSON")
 
     @property
-    def files(self):
+    def files(self) -> MultiDict:
         """
         Return a MultiDict of all ``FileUpload`` objects available.
         """
@@ -263,7 +263,7 @@ class Request(object):
         ...
 
     @t.overload
-    def get(self, key: str, *, type: t.Callable[[str], T2]) -> t.Union[T2, None]:
+    def get(self, key: str, *, type: t.Callable[[str], T2] = str) -> t.Union[T2, None]:
         ...
 
     @t.overload
@@ -391,7 +391,7 @@ class Request(object):
         ...
 
     @t.overload
-    def getint(self, key: str, default: T1) -> t.Union[int, T1, None]:
+    def getint(self, key: str, default: T1) -> t.Union[int, T1]:
         ...
 
     @t.overload

fresco/response.py

@@ -277,7 +277,7 @@ def encoder(stream, charset):
 
 
 def make_header_name(name):
-    """\
+    """
     Return a formatted header name from a python idenfier.
 
     Example usage::
@@ -677,8 +677,10 @@ class Response(object):
                 newheaders.append((k, v))
         return self.replace(headers=newheaders + [("Vary", ", ".join(_vary_on))])
 
-    def replace(self, content=None, status=None, headers=None, **kwheaders):
-        """\
+    def replace(
+        self, content=None, status=None, headers=None, **kwheaders
+    ) -> "Response":
+        """
         Return a new response object with any of content, status or headers
         changed.
 
@@ -758,7 +760,7 @@ class Response(object):
         return default_charset
 
     @classmethod
-    def not_found(cls, request=None):
+    def not_found(cls, request=None) -> "Response":
         """
         Return an HTTP not found response (404).
 
@@ -781,7 +783,7 @@ class Response(object):
         )
 
     @classmethod
-    def error(cls, message="500 Internal Server Error"):
+    def error(cls, message="500 Internal Server Error") -> "Response":
         """
         Return an HTTP server error response (500).
 
@@ -803,7 +805,7 @@ class Response(object):
         )
 
     @classmethod
-    def unauthorized(cls, authenticate):
+    def unauthorized(cls, authenticate) -> "Response":
         """
         Return an HTTP unauthorized response (401)
         """
@@ -818,7 +820,7 @@ class Response(object):
         )
 
     @classmethod
-    def unauthorized_basic(cls, realm):
+    def unauthorized_basic(cls, realm) -> "Response":
         """
         Return an HTTP unauthorized response (401) with a WWW-Authenticate
         header set for HTTP Basic authentication..
@@ -826,7 +828,7 @@ class Response(object):
         return cls.unauthorized(authenticate=f'Basic realm="{realm}"')
 
     @classmethod
-    def forbidden(cls, message="Sorry, access is denied"):
+    def forbidden(cls, message="Sorry, access is denied") -> "Response":
         """
         Return an HTTP forbidden response (403).
 
@@ -842,7 +844,9 @@ class Response(object):
         )
 
     @classmethod
-    def bad_request(cls, request=None):
+    def bad_request(
+        cls, message="The server could not understand your request", request=None
+    ) -> "Response":
         """
         Return an HTTP bad request response.
 
@@ -856,16 +860,17 @@ class Response(object):
         return cls(
             status=STATUS_BAD_REQUEST,
             content=[
-                "<html>"
-                "<body>"
-                "<h1>The server could not understand your request</h1>"
-                "</body>"
-                "</html>"
+                f"<html>"
+                f"<body>"
+                f"<h1>Bad request</h1>"
+                f"<p>{message}</p>"
+                f"</body>"
+                f"</html>"
             ],
         )
 
     @classmethod
-    def length_required(cls, request=None):
+    def length_required(cls, request=None) -> "Response":
         """
         Return an HTTP Length Required response (411).
 
@@ -888,7 +893,7 @@ class Response(object):
         )
 
     @classmethod
-    def payload_too_large(cls, request=None):
+    def payload_too_large(cls, request=None) -> "Response":
         """
         Return an HTTP Payload Too Large response (413)::
 
@@ -903,7 +908,7 @@ class Response(object):
     request_entity_too_large = payload_too_large
 
     @classmethod
-    def method_not_allowed(cls, valid_methods):
+    def method_not_allowed(cls, valid_methods) -> "Response":
         """
         Return an HTTP method not allowed response (405)::
 
@@ -925,7 +930,7 @@ class Response(object):
         )
 
     @classmethod
-    def internal_server_error(cls):
+    def internal_server_error(cls) -> "Response":
         """
         Return an HTTP internal server error response (500).
 
@@ -946,7 +951,7 @@ class Response(object):
     @classmethod
     def unrestricted_redirect(
         cls, location, request=None, status=STATUS_FOUND, **kwargs
-    ):
+    ) -> "Response":
         """
         Return an HTTP redirect reponse (30x).
 
@@ -1004,7 +1009,7 @@ class Response(object):
                     request = fresco.context.request
                 location = request.resolve_url(location)
 
-        return Response(
+        return cls(
             "<html><head></head><body>\n"
             "<h1>Page has moved</h1>\n"
             "<p><a href='%s'>%s</a></p>\n"
@@ -1014,8 +1019,8 @@ class Response(object):
         )
 
     @classmethod
-    def unrestricted_redirect_permanent(cls, *args, **kwargs):
-        """\
+    def unrestricted_redirect_permanent(cls, *args, **kwargs) -> "Response":
+        """
         Return an HTTP permanent redirect reponse.
 
         :param location: the URI of the new location. If relative this will be
@@ -1027,8 +1032,8 @@ class Response(object):
         return cls.unrestricted_redirect(*args, **kwargs)
 
     @classmethod
-    def unrestricted_redirect_temporary(cls, *args, **kwargs):
-        """\
+    def unrestricted_redirect_temporary(cls, *args, **kwargs) -> "Response":
+        """
         Return an HTTP permanent redirect reponse.
 
         :param location: the URI of the new location. If relative this will be
@@ -1048,7 +1053,7 @@ class Response(object):
         _is_safe_url=is_safe_url,
         allowed_hosts=frozenset(),
         **kwargs,
-    ):
+    ) -> "Response":
         """
         Return an HTTP redirect reponse (30x). Will only redirect to the
         current host or hosts in the ``allowed_hosts`` list. A ``ValueError``
@@ -1075,19 +1080,22 @@ class Response(object):
         """
         # Create the fallback redirect response always so that
         # changes to route names don't result in latent bugs
+        fallback_response = None
         if fallback:
-            fallback = Response.unrestricted_redirect(fallback, status=status, **kwargs)
-        if callable(url) or "//" not in url:
+            fallback_response = cls.unrestricted_redirect(
+                fallback, status=status, **kwargs
+            )
+        if url and (
+            callable(url) or "//" not in url or _is_safe_url(url, allowed_hosts)
+        ):
             return cls.unrestricted_redirect(url, status=status, **kwargs)
 
-        if url and _is_safe_url(url, allowed_hosts):
-            return cls.unrestricted_redirect(url, status=status, **kwargs)
-        if fallback:
-            return fallback
+        if fallback_response:
+            return fallback_response
         raise ValueError("Unsafe URL")
 
     @classmethod
-    def redirect_permanent(cls, *args, **kwargs):
+    def redirect_permanent(cls, *args, **kwargs) -> "Response":
         """
         Return an HTTP permanent redirect reponse.
 
@@ -1100,7 +1108,7 @@ class Response(object):
         return cls.redirect(*args, **kwargs)
 
     @classmethod
-    def redirect_temporary(cls, *args, **kwargs):
+    def redirect_temporary(cls, *args, **kwargs) -> "Response":
         """
         Return an HTTP permanent redirect reponse.
 
@@ -1113,7 +1121,7 @@ class Response(object):
         return cls.redirect(*args, **kwargs)
 
     @classmethod
-    def meta_refresh(cls, location, delay=1, request=None):
+    def meta_refresh(cls, location, delay=1, **kwargs) -> "Response":
         """
         Return an HTML page containing a <meta http-equiv="refresh"> tag,
         causing the browser to redirect to the given location after ``delay``
@@ -1124,21 +1132,19 @@ class Response(object):
                          request.
 
         """
-        if "://" not in location:
-            if request is None:
-                request = fresco.context.request
-            location = request.resolve_url(location)
-        return cls(
-            [
-                (
-                    "<!DOCTYPE html>"
-                    "<html>"
-                    '<head><meta http-equiv="refresh" content="0; url={0}"></head>'
-                    '<body><p><a href="{0}">Click here to continue</a></p></body>'
-                    "</html>"
-                ).format(location)
+        response = cls.redirect(location, **kwargs)
+        location = response.get_header("location")
+        return response.replace(
+            status="200 OK",
+            content=[
+                f"<!DOCTYPE html>"
+                f"<html>"
+                f'<head><meta http-equiv="refresh" content="0; url={location}"></head>'
+                f'<body><p><a href="{location}">Click here to continue</a></p></body>'
+                f"</html>"
             ],
             content_type="text/html",
+            location=None,
         )
 
     @classmethod
@@ -1152,7 +1158,7 @@ class Response(object):
         headers=None,
         dumps=stdlib_json.dumps,
         **kwargs,
-    ):
+    ) -> "Response":
         """
         Return an ``application/json`` response with the given data
         JSON serialized

fresco/routing.py

@@ -21,6 +21,7 @@ from collections import defaultdict
 from collections import namedtuple
 from collections.abc import Collection
 from collections.abc import MutableSequence
+from collections.abc import Sequence
 from importlib import import_module
 from functools import partial
 from typing import Any
@@ -732,11 +733,11 @@ class Route(object):
         view: Optional[Union[ViewCallable, "RouteCollection", str]] = None,
         kwargs: Optional[dict[str, Any]] = None,
         args=None,
-        name=None,
+        name: Optional[str] = None,
         predicate=None,
         decorators=None,
         filters=None,
-        fallthrough_on=None,
+        fallthrough_on: Optional[Sequence[int]] = None,
         provide_request: Optional[bool] = None,
         **_kwargs: ViewCallable,
     ):
@@ -771,7 +772,7 @@ class Route(object):
         :param **_kwargs:   Keyword arguments matching HTTP method names
                             (GET, POST etc) can used to specify views
                             associated with those methods.
-                            Other keyword aruments are passed through to the
+                            Other keyword arguments are passed through to the
                             view callable.
 
         Naming routes
@@ -839,6 +840,12 @@ class Route(object):
         for method in ALL_METHODS:
             if method in _kwargs:
                 method_view_map[method] = _kwargs.pop(method)
+        if _kwargs:
+            for k in list(_kwargs):
+                trymethods = k.split("_")
+                if all(m in ALL_METHODS for m in trymethods):
+                    method_view_map.update((m, _kwargs[k]) for m in trymethods)
+                    _kwargs.pop(k)
 
         if not isinstance(pattern, Pattern):
             pattern = self.pattern_class(pattern)
@@ -885,7 +892,7 @@ class Route(object):
             args or _kwargs.pop("view_args", tuple())  # type: ignore
         )
         self.view_kwargs: dict[str, Any] = dict(
-            kwargs or _kwargs.pop("view_kwargs", {}), **_kwargs   # type: ignore
+            kwargs or _kwargs.pop("view_kwargs", {}), **_kwargs  # type: ignore
         )
 
         for arg in self.view_args:

fresco/tests/test_response.py

@@ -87,6 +87,12 @@ class TestCannedResponses(object):
             r = Response.redirect("http://bad.example.com/", "gloop", barfle=23)
         assert r.get_header("Location") == "http://localhost/arfle/23"
 
+    def test_redirect_uses_fallback_for_empty_url(self):
+        app = FrescoApp()
+        with app.requestcontext():
+            r = Response.redirect("", "http://localhost/foo")
+        assert r.get_header("Location") == "http://localhost/foo"
+
     def test_not_found(self):
         with FrescoApp().requestcontext():
             r = Response.not_found()
@@ -130,6 +136,16 @@ class TestCannedResponses(object):
         assert r.status == "200 OK"
         assert r.get_header("Content-Type") == "text/html"
 
+    def test_meta_refresh_to_view(self):
+
+        app = FrescoApp()
+        view = Mock(return_value=Response())
+        app.route("/arfle/<barfle:int>", GET, view)
+        with app.requestcontext():
+            r = Response.meta_refresh(view, barfle=42)
+        content = b"".join(r.content_iterator)
+        assert b'url=http://localhost/arfle/42"' in content
+
     def test_json(self):
         with FrescoApp().requestcontext():
             r = Response.json(

fresco/tests/test_routing.py

@@ -137,6 +137,16 @@ class TestRouteConstructor(object):
         assert len(list(app.get_route_traversals("/y", POST))) == 1
         assert len(list(app.get_route_traversals("/y", OPTIONS))) == 1
 
+    def test_multiple_methods_can_be_expressed_using_kwargs(self):
+        def view():
+            return Response()
+
+        app = FrescoApp()
+        app.route("/x", GET_POST=view)
+        assert len(list(app.get_route_traversals("/x", GET))) == 1
+        assert len(list(app.get_route_traversals("/x", POST))) == 1
+        assert len(list(app.get_route_traversals("/x", OPTIONS))) == 0
+
 
 class TestRouteBeforeHooks(object):
     def test_hook_is_called(self):

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

@@ -1,15 +1,14 @@
 Metadata-Version: 2.4
 Name: fresco
-Version: 3.7.0
+Version: 3.9.0
 Summary: A Web/WSGI micro-framework
 Author-email: Oliver Cope <oliver@redgecko.org>
-License: Apache
+License-Expression: Apache-2.0
 Project-URL: Homepage, https://ollycope.com/software/fresco/latest/
 Keywords: wsgi,web,www,framework
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content

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

@@ -1,18 +1,18 @@
-fresco/__init__.py,sha256=Jo5gW2Xce2hmtXhfaXXJR4aBW1KFYb0Murx2JfIo_E8,3537
+fresco/__init__.py,sha256=gy3VchKsKsoWqZFqIbMhgzIjNCeFlcNnTl225TC_8qw,3537
 fresco/cookie.py,sha256=Qnx8yOjU4LUJ1fqi7YvqbhAA01rCsclJGl_fxI68slw,7055
-fresco/core.py,sha256=bqGDgm4OH46j6HqnC5nJyn9n1dQw-I1ntUY8dIpeO_M,26988
+fresco/core.py,sha256=5sV6dTOhtEgEpMH_4sjoI0ewZYLvAPnRjyTfNkm490Q,27037
 fresco/decorators.py,sha256=JL4MlsJz4RWRAuOCCB3fx3rtd-E1CvwO2MD7bf94yHM,3324
 fresco/defaults.py,sha256=YStD4MPcCtq-fREFoupSaAS0SY8lH1oEnKDONlR86zs,26
 fresco/exceptions.py,sha256=KE-LoYUGnho6KltzkU6cnm9vUiUhAiDIjPqn5ba-YCA,4410
 fresco/middleware.py,sha256=TH1I5NthLDwnOdluOSFpP_9SQQYhYqh-8lGuAXT74dc,4811
 fresco/multidict.py,sha256=lKRpSP1XNghLp2-i5cXPfPQxuoJclHpNkWk91F4GI1o,13152
-fresco/options.py,sha256=X66xZV45vWIyQR2GwFTLgV2QGoXOfLhHURWQ_edoxmY,17024
+fresco/options.py,sha256=xMh23WS6HB7P9ka_S0X3DoGSSvb8ESl1m8Pqb52Mork,17152
 fresco/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fresco/request.py,sha256=XJ9SJAe9zILfWt-YB4zxjIrjECrLYzyxjZ9xk8h4tAw,30024
+fresco/request.py,sha256=B3OeD4H_2HrgRbg5HhkjiHZ6JWiXTe98wYdtpLbNBCw,30046
 fresco/requestcontext.py,sha256=_AJ7DMT5vlIO4Uc-WlRsYJdRge4WRO7ygibKImOS0iM,3601
-fresco/response.py,sha256=ilJ_Wbp7LVP1E6bXp0iAy1o6D0hboXtpLvm2ZCmUGmk,37277
+fresco/response.py,sha256=9RB9f6tgS_voM-MK36vGzWpkpp6JISnbF--F2FsAT7g,37605
 fresco/routeargs.py,sha256=E-LQutqg6AojtagZojF7NeMjFBk9joRNMGo842IMTBk,10598
-fresco/routing.py,sha256=r_vPD1xc7brOrbw1iO0X2IP7WX5wlIWlcXwcNndU1ZY,61259
+fresco/routing.py,sha256=d8Z2QyW-X5W4_7wrG39G7PgzwSgLe-8RvxeBJfoh0L0,61615
 fresco/static.py,sha256=rNQz_8-PVhSGup_w-HycqatLEbFes7VSlnNQ0rz24pU,2529
 fresco/subrequests.py,sha256=fOG9Bd3w9Ova0S3qv5ssxQ_otrSxaFcKG7TOy6CxNCg,11068
 fresco/types.py,sha256=PbXppEcckX4ohU8npteU1mCkHOuXQxrnqxk1RNEFXkE,797
@@ -27,9 +27,9 @@ fresco/tests/test_multidict.py,sha256=uIa1cu5DMAukX2nLOjTiB12oh0icBeSPfsUnqsu85m
 fresco/tests/test_options.py,sha256=394MLLTyf4vmfkUyqQ8EGIiTTJsQh7P9M6eta2wgUbw,12764
 fresco/tests/test_request.py,sha256=wGDwxCZMbzyGgQJwM2Nlsf0ogcGenXN3srO8dQEhE24,16777
 fresco/tests/test_requestcontext.py,sha256=t8hm-lzIk85ryb3sdlpVoPQyLDWpCjB86dg8nVG1yRw,3115
-fresco/tests/test_response.py,sha256=MrhHIDg81pJlTeEcn2rGtU-i59s1KzEccF81u4Up6xs,8934
+fresco/tests/test_response.py,sha256=PYMEr7aJfHMU3eIkBnGN5I6TpYf0xua2-95aNhU1Y7w,9544
 fresco/tests/test_routeargs.py,sha256=VMWUbrXegTLN9Tx2AcrpbjAAEaxAANzkcy02SmpFOmY,8162
-fresco/tests/test_routing.py,sha256=NBBJ6UcsdSoUAFNgUtCC0lEEeKB6JxS8XyrUeef25M8,40018
+fresco/tests/test_routing.py,sha256=smRhdbru9mRXd0x_bmawCSZbZV7bR1z-9BRiFB9hOJc,40408
 fresco/tests/test_static.py,sha256=y73dqzE2flpACQ_dvNhDzk_WlvNQfkhYF_8YY4MMGDo,4686
 fresco/tests/test_subrequests.py,sha256=7rluJnw-elXRXfrzvAQvGBHRBU93zwnL827mTxBGd3Y,7909
 fresco/tests/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -51,8 +51,8 @@ fresco/util/security.py,sha256=nXEdoCak_2c4OA1L1wGwhZygS22s2fzwR0Kp-DdwKZg,1058
 fresco/util/textproc.py,sha256=e5jLTofKCqdm6_Fy8XOyR43AJr5APtL59Kd8cNA9PrQ,2309
 fresco/util/urls.py,sha256=V6-s2WgeARkEcuzpwqtiM8ebOXe5-mNUKOJ8N9LNBHA,10051
 fresco/util/wsgi.py,sha256=RYw4KeOUjzzPOL_HhEtgLyCngofjMdAT8BTLOSKU6KA,13021
-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.9.0.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+fresco-3.9.0.dist-info/METADATA,sha256=wQn0fuVCpyBdudhkG3lu_8azHj5P__kApDRqeYHDs6M,1523
+fresco-3.9.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+fresco-3.9.0.dist-info/top_level.txt,sha256=p_1aMce5Shjq9fIfdbB-aN8wCDhjF_iYnn98bUebbII,7
+fresco-3.9.0.dist-info/RECORD,,

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

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