fresco 3.3.2__py3-none-any.whl → 3.3.4__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.2"
+__version__ = "3.3.4"
 
 DEFAULT_CHARSET = "UTF-8"
 

fresco/options.py

@@ -127,6 +127,12 @@ class Options(dict):
         Where filename contain multiple tags, all tags must match for the file
         to be loaded.
 
+        Files are processed in the order that tags are specified in the
+        ``tags`` parameter, and then in lexicographical order.
+        For example, calling ``options.load(..., tags=["dev", "local"])`` would
+        cause a file named "settings.dev" to be loaded before one named
+        "settings.local".
+
         Tag names may contain the names of environment variable surrounded by
         braces, for example ``{USER}``. These will be substituted for the
         environment variable's value, with any dots or path separators replaced
@@ -210,9 +216,11 @@ class Options(dict):
                 ts[1]
                 for ts in sorted(
                     tagged_sources,
-                    key=lambda ts: -1
-                    if len(ts[0]) == 0
-                    else min(tags.index(t) for t in ts[0]),
+                    key=(
+                        lambda ts: ([], ts[1])
+                        if len(ts[0]) == 0
+                        else (sorted(tags.index(t) for t in ts[0]), ts[1])
+                    )
                 )
             ]
         else:

fresco/request.py

@@ -294,7 +294,7 @@ class Request(object):
 
     @property
     def now(  # type: ignore
-        self, utcnow=datetime.datetime.now, utc=datetime.timezone.utc
+        self, now=datetime.datetime.now, utc=datetime.timezone.utc
     ):
         """
         Return a timezone-aware UTC datetime instance. The value returned is
@@ -302,7 +302,7 @@ class Request(object):
         """
         if self._now:
             return self._now
-        self._now = utcnow().replace(tzinfo=utc)
+        self._now = now(utc)
         return self._now
 
     @property

fresco/response.py

@@ -386,7 +386,7 @@ class Response(object):
             self.status = "200 OK"
         else:
             try:
-                self.status = "%d %s" % (status, HTTP_STATUS_CODES[status])
+                self.status = f"{status} {HTTP_STATUS_CODES[status]}"
             except KeyError:
                 self.status = str(status)
 

fresco/routing.py

@@ -1386,7 +1386,7 @@ class RouteCollection(MutableSequence):
 
     def _get_routes(
         self, key: Tuple[t.Optional[str], str]
-    ) -> t.Sequence[t.Tuple[Route, t.Optional[PathMatch]]]:
+    ) -> t.Sequence[t.Tuple[Route, 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]

fresco/tests/fixtures.py

@@ -0,0 +1,67 @@
+# encoding=UTF-8
+# Copyright 2015 Oliver Cope
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.
+#
+from fresco import Route
+from fresco.routing import GET
+from fresco.response import Response
+
+# A unicode path that can't be represented using ASCII encoding
+unquoted_unicode_path = "/ø"
+
+# IRI quoted version of the same path. This is the string the server
+# would receive as the HTTP Request-URI
+quoted_unicode_path = "/%C3%B8"
+
+# WSGI encoded version of the path. This is the string that appears in the
+# environ dict.
+wsgi_unicode_path = b"/\xc3\xb8".decode("latin1")
+
+# Malformed path, as sent to the server by a non conforming client.
+# The code point has been incorrectly encoded in latin-1 instead of
+# UTF-8
+misquoted_wsgi_unicode_path = b"/\xf8".decode("latin1")
+
+
+class CBV(object):
+    """
+    A class based view
+    """
+
+    __routes__ = [
+        Route("/", GET, "index_html"),
+        Route("/page", GET, "view_page"),
+        Route("/page2", GET, "view_page", tag="page2"),
+    ]
+
+    def __init__(self, s):
+        self.s = s
+
+    def index_html(self):
+        return Response([self.s])
+
+    def view_page(self):
+        return Response([])
+
+
+def module_level_function():
+    """
+    A module level function
+    """
+
+
+def wsgi_app(environ, start_response):
+    start_response("200 OK", [("Content-Type", "text/plain")])
+
+    return [b"ok"]

fresco/tests/test_cookie.py

@@ -0,0 +1,59 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.
+#
+from datetime import tzinfo, datetime, timedelta
+from fresco.cookie import Cookie
+
+
+class FakeTZInfo(tzinfo):
+    def utcoffset(self, dt):
+        return timedelta(seconds=3600)
+
+    def dst(self, dt):
+        return timedelta(seconds=0)
+
+    def tzname(self, dt):
+        return "ZZZ"
+
+
+class TestCookie(object):
+    def test_basic_cookie(self):
+        """Simple cookie with just a field and value"""
+        c = Cookie("key", "value")
+        assert str(c) == "key=value;Path=/;SameSite=Lax"
+
+    def test_nopath_cookie(self):
+        """Simple cookie with just a field and value"""
+        c = Cookie("key", "value", path=None)
+        assert str(c) == "key=value;SameSite=Lax"
+
+    def test_httponly_cookie(self):
+        """Cookie as HttpOnly"""
+        c = Cookie("key", "value", httponly=True)
+        assert str(c) == "key=value;Path=/;HttpOnly;SameSite=Lax"
+
+    def test_secure_cookie(self):
+        """Cookie as secure cookie"""
+        c = Cookie("key", "value", secure=True)
+        assert str(c) == "key=value;Path=/;Secure;SameSite=Lax"
+
+    def test_secure_and_httponly(self):
+        """Cookie as both secure and httponly"""
+        c = Cookie("key", "value", secure=True, httponly=True)
+        assert str(c) == "key=value;Path=/;Secure;HttpOnly;SameSite=Lax"
+
+    def test_dates_are_rfc_formatted(self):
+        c = Cookie("a", "b", expires=datetime(2001, 1, 1, 12))
+        assert "Expires=Mon, 01 Jan 2001 12:00:00 GMT;" in str(c)
+        c = Cookie("a", "b", expires=datetime(2001, 1, 1, 12, tzinfo=FakeTZInfo()))
+        assert "Expires=Mon, 01 Jan 2001 11:00:00 GMT;" in str(c)