fresco 3.3.0__py3-none-any.whl → 3.3.1__py3-none-any.whl

fresco/__init__.py

@@ -12,7 +12,7 @@
 #     See the License for the specific language governing permissions and
 #     limitations under the License.
 #
-__version__ = "3.3.0"
+__version__ = "3.3.1"
 
 DEFAULT_CHARSET = "UTF-8"
 

fresco/core.py

@@ -259,7 +259,7 @@ class FrescoApp(RouteCollection):
 
         # Is the URL just missing a trailing '/'?
         if not path or path[-1] != "/":
-            for _ in self.get_methods(request, path + "/"):
+            if self.get_methods(request, path + "/"):
                 return Response.unrestricted_redirect_permanent(path + "/")
 
         return Response.not_found()
@@ -287,7 +287,9 @@ class FrescoApp(RouteCollection):
 
         return response
 
-    def handle_http_error_response(self, request, response):
+    def handle_http_error_response(
+        self, request: Request, response: Response
+    ) -> Response:
         """
         Call any process_http_error_response handlers and return the
         (potentially modified) response object.
@@ -303,8 +305,8 @@ class FrescoApp(RouteCollection):
                 self.log_exception(request)
         return response
 
-    def get_methods(self, request, path):
-        """\
+    def get_methods(self, request: Request, path: str) -> Set[str]:
+        """
         Return the HTTP methods valid in routes to the given path
         """
         methods: Set[str] = set()

fresco/routing.py

@@ -370,15 +370,15 @@ class PathConverter(StrConverter):
 
 
 class MatchAllURLsPattern(Pattern):
-    """\
-    A pattern matcher that matches all URLs starting with the given prefix. No
-    arguments are parsed from the URL.
+    """
+    A pattern matcher that matches all paths starting with the given prefix.
+    No arguments are parsed from the URL.
     """
 
     def __init__(self, path):
         self.path = path
 
-    def match(self, path):
+    def match(self, path: str) -> t.Optional[PathMatch]:
         if path.startswith(self.path):
             return PathMatch(self.path, path[len(self.path) :], (), {})
         return None
@@ -400,6 +400,32 @@ class MatchAllURLsPattern(Pattern):
         return "%s*" % (self.path,)
 
 
+class PrefixPattern(MatchAllURLsPattern):
+    """
+    A pattern matcher that matches the given prefix. The prefix will only be
+    matched at a path separator boundary.
+
+    ``PrefixPattern('/foo')`` will match the paths ``/foo`` and ``/foo/bar``,
+    but not ``/foobar``.
+
+    No arguments are parsed from the URL.
+    """
+
+    def __init__(self, path):
+        super().__init__(path)
+        if path[-1] == "/":
+            self.path_with_sep = path
+        else:
+            self.path_with_sep = f"{self.path}/"
+
+    def match(self, path: str) -> t.Optional[PathMatch]:
+        prefix = path[: len(self.path_with_sep)]
+
+        if prefix == self.path or prefix == self.path_with_sep:
+            return PathMatch(self.path, path[len(self.path) :], (), {})
+        return None
+
+
 class ExtensiblePattern(Pattern):
     """\
     An extensible URL pattern matcher.
@@ -547,10 +573,10 @@ class ExtensiblePattern(Pattern):
         """
         return eval("(lambda *args, **kwargs: (args, kwargs))(%s)" % argstr)
 
-    def match(self, path):
+    def match(self, path) -> t.Optional[PathMatch]:
         """
-        Test ``path`` and return a tuple of parsed ``(args, kwargs)``, or
-        ``None`` if there was no match.
+        Test ``path`` and return a PathMatch object or ``None`` if there was no
+        match.
         """
         mo = self.regex_match(path)
         if mo is None:
@@ -1358,13 +1384,18 @@ class RouteCollection(MutableSequence):
                     exc = self.__routed_views__[viewspec] = RouteNotFound(viewspec)
                     raise exc
 
-    def _get_routes(self, key):
+    def _get_routes(
+        self, key: Tuple[t.Optional[str], str]
+    ) -> t.Sequence[t.Tuple[Route, t.Optional[PathMatch]]]:
         method, path = key
         routes = ((r, r.match(path, method)) for r in self.__routes__)
         return [(r, t) for (r, t) in routes if t is not None]
 
     def get_route_traversals(
-        self, path: str, method: Optional[str], request: Optional[Request] = None
+        self,
+        path: str,
+        method: Optional[str],
+        request: Optional[Request] = None,
     ) -> t.Iterator[RouteTraversal]:
         """
         Generate RouteTraversals for routes matching the given path and
@@ -1604,7 +1635,7 @@ class RouteCollection(MutableSequence):
         :param path: the path prefix at which the view will be routed
         """
         return self.route(
-            MatchAllURLsPattern(path),
+            PrefixPattern(path),
             methods,
             view,
             route_class=route_class,

fresco/subrequests.py

@@ -272,6 +272,7 @@ def _get_args_for_route(
     route_kwargs = {}
     route_args = list(
         chain(
+            [request] if route.provide_request else [],
             ((a(request) if isinstance(a, RouteArg) else a) for a in route.view_args),
             (
                 mutable_args.pop(0)

{fresco-3.3.0.dist-info → fresco-3.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fresco
-Version: 3.3.0
+Version: 3.3.1
 Summary: A Web/WSGI micro-framework
 Home-page: https://ollycope.com/software/fresco/latest/
 Author: Oliver Cope

{fresco-3.3.0.dist-info → fresco-3.3.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
-fresco/__init__.py,sha256=jE_pFG-3XUTi6myDqNDowJ_W45C3OFc1fag95JMBXsk,3520
+fresco/__init__.py,sha256=e0KXsDXDex3v2Efu5cGbMvN-jttFfz1aDo7pyG7O_rE,3520
 fresco/cookie.py,sha256=Qnx8yOjU4LUJ1fqi7YvqbhAA01rCsclJGl_fxI68slw,7055
-fresco/core.py,sha256=qOYE3mSqZNVo7v6zXwfBedIiyfnJMkID1FUYoDRZtus,26551
+fresco/core.py,sha256=mwYR6UP0zRSjcFlNZf51-otX9EcmvgjEZ7GDVQoQexg,26615
 fresco/decorators.py,sha256=84NUpRJ-M7GK6wDl42bmCRSvgoWzCsy1huyvGnSAPPw,3232
 fresco/exceptions.py,sha256=KE-LoYUGnho6KltzkU6cnm9vUiUhAiDIjPqn5ba-YCA,4410
 fresco/middleware.py,sha256=uCAuOtBnvaVBJGrQa8ecvLkSZ6aSKmWaJqxB8Rv4SsQ,4173
@@ -10,9 +10,9 @@ fresco/request.py,sha256=JCETzqzGZgPpS7IBdqi4Hk3CTwTGiaTtRXFW_nPP1yg,27071
 fresco/requestcontext.py,sha256=P-SkKJkKLYVqNiR2zwooRROnSnE2VMj2P2-eD5DW5Qg,3504
 fresco/response.py,sha256=Pz8icriWhHNVsTkB5x5y99yvcz-nFC7Eobuv7tfLE3s,37078
 fresco/routeargs.py,sha256=dxNlqbQ1FrgIY6OCFzcEMdZ0OVyjlMQdQGLmUJgdPYU,10176
-fresco/routing.py,sha256=BrzTcT788JG_u4eLHaFcViztee1-OWHloD8WZI1CSA8,57738
+fresco/routing.py,sha256=nh7TiyDPQ1Y4RCXJGj_Wk-BP1UqpNyh6BKqxhNHlQ8U,58670
 fresco/static.py,sha256=9SKQ3P1YFTP45Qiic-ycvkpKRvqIURp1XSzPazTmYLI,2513
-fresco/subrequests.py,sha256=QvcEKgWtJqDkHzjNKIoFENO372S_b4D1Lh5_LHhrPLI,11025
+fresco/subrequests.py,sha256=wFJWLuhVAcei5imYc5NBSCBaHBEm-X4_XswPtK3O4Zw,11081
 fresco/types.py,sha256=UHITRMDoS90s2zV2wNpqLFhRWESfaBAMuQnL4c21mqY,106
 fresco/typing.py,sha256=jQ1r_wme54J08XZUdmuuW4M8ve-gEhm1Wriwctls3r8,347
 fresco/util/__init__.py,sha256=mJkaZzvYgBnxsBAGv8y_P1yzonHqWgw6VF2Zs4rmJEA,7
@@ -27,8 +27,8 @@ fresco/util/security.py,sha256=nXEdoCak_2c4OA1L1wGwhZygS22s2fzwR0Kp-DdwKZg,1058
 fresco/util/textproc.py,sha256=e5jLTofKCqdm6_Fy8XOyR43AJr5APtL59Kd8cNA9PrQ,2309
 fresco/util/urls.py,sha256=aaVovLyXNlVoGviiLN94ImqXf-LTQs_xooEIyi3LBc4,9195
 fresco/util/wsgi.py,sha256=dV69VjJ7W8OqAxWzlA0dz7vAuC1MliNBnbr1MSyB6Is,12970
-fresco-3.3.0.dist-info/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-fresco-3.3.0.dist-info/METADATA,sha256=Q_8zOUv7tS4JlhN5TjXxN82m2kRrY5-6PzxGyxb38DA,1575
-fresco-3.3.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-fresco-3.3.0.dist-info/top_level.txt,sha256=p_1aMce5Shjq9fIfdbB-aN8wCDhjF_iYnn98bUebbII,7
-fresco-3.3.0.dist-info/RECORD,,
+fresco-3.3.1.dist-info/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+fresco-3.3.1.dist-info/METADATA,sha256=DEjrYiyD-gUvPOYEjyZz8y1y8PBrzIUxPx9wFuv7w_o,1575
+fresco-3.3.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+fresco-3.3.1.dist-info/top_level.txt,sha256=p_1aMce5Shjq9fIfdbB-aN8wCDhjF_iYnn98bUebbII,7
+fresco-3.3.1.dist-info/RECORD,,