fresco 3.3.3__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.3"
+__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/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/test_options.py

@@ -216,10 +216,15 @@ class TestLoadOptions:
     def test_it_loads_in_tag_order(self, tmpdir):
         with self.check_loadoptions(
             tmpdir,
-            {"a.dev.txt": "a = dev", "a.local.txt": "a = local"},
+            {
+                "a": "a = 0",
+                "a.dev.txt": "a = ${a}-1",
+                "a.local.txt": "a = ${a}-2",
+                "b.dev.txt": "a = ${a}-3",
+            },
         ) as loadopts:
-            assert loadopts("*", ["dev", "local"]) == {"a": "local"}
-            assert loadopts("*", ["local", "dev"]) == {"a": "dev"}
+            assert loadopts("*", ["dev", "local"]) == {"a": "0-1-3-2"}
+            assert loadopts("*", ["local", "dev"]) == {"a": "0-2-1-3"}
 
     def test_it_loads_from_os_environ(self, tmpdir):
         with setenv(a="2"):

{fresco-3.3.3.dist-info → fresco-3.3.4.dist-info}/METADATA

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

{fresco-3.3.3.dist-info → fresco-3.3.4.dist-info}/RECORD

@@ -1,16 +1,16 @@
-fresco/__init__.py,sha256=q7o1b5uoXjD0qXFnnM2oLCJDwUgJvkcrnL785B9wl3I,3520
+fresco/__init__.py,sha256=DkBKfTdD88kXZYGi5Pv686Es1twTgZ4fVO3mA2nf0GQ,3520
 fresco/cookie.py,sha256=Qnx8yOjU4LUJ1fqi7YvqbhAA01rCsclJGl_fxI68slw,7055
 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
 fresco/multidict.py,sha256=0CaNNIcFnZ1hLk3NExhNvjc_BtK4zVB26L9gP_7MeNM,13362
-fresco/options.py,sha256=JneUzO1Ep4c3UbX-1icBZ9cZGheVmZAXdvegrbI39mw,13614
+fresco/options.py,sha256=0RzwO1eyCUC70GxKFnCHNKDyZwsKc9Q-AmtlMAnfZ-Q,14004
 fresco/request.py,sha256=dC7pMg-4Kxa6PcqaaWFL4JviANQotuBjoKwlxZYywRY,27048
 fresco/requestcontext.py,sha256=P-SkKJkKLYVqNiR2zwooRROnSnE2VMj2P2-eD5DW5Qg,3504
 fresco/response.py,sha256=ADKHbtAGyhwtaUJxB7m_1nqVdZRKUryebmG4FDUjZVY,37072
 fresco/routeargs.py,sha256=dxNlqbQ1FrgIY6OCFzcEMdZ0OVyjlMQdQGLmUJgdPYU,10176
-fresco/routing.py,sha256=NxWPuVI3_zSSuAgNMeQY-3DPfb1FtAUmG7oRtotPoMM,58721
+fresco/routing.py,sha256=kTFqJ9Nn9cOHlul-lHqKDurBwqlEO4fg8tertb1jkoI,58709
 fresco/static.py,sha256=9SKQ3P1YFTP45Qiic-ycvkpKRvqIURp1XSzPazTmYLI,2513
 fresco/subrequests.py,sha256=wFJWLuhVAcei5imYc5NBSCBaHBEm-X4_XswPtK3O4Zw,11081
 fresco/types.py,sha256=UHITRMDoS90s2zV2wNpqLFhRWESfaBAMuQnL4c21mqY,106
@@ -23,7 +23,7 @@ fresco/tests/test_decorators.py,sha256=VFXHo1gm2jldQXeaEF3NNo5fnpdJ-LXc8-vNymPJK
 fresco/tests/test_exceptions.py,sha256=R0Tn86m33iTKecZ69TgH4CqY9XSFP0FsLMH10O5Jth8,973
 fresco/tests/test_middleware.py,sha256=D_sWfX-w3bhItOm54nB_cuYPGoWopISvZCFIuMX68cU,3137
 fresco/tests/test_multidict.py,sha256=uDwDYII0dvVxaEyDO85zRTWlIWw3LO3StzYemJVm0E0,7565
-fresco/tests/test_options.py,sha256=3h62x2ZgKavQ0qmpkKxQ2kbnEb50AgrTvG-PMOqs428,10868
+fresco/tests/test_options.py,sha256=Zx1tLVLeok8tO3dWua2PyTPZgeWbXFMXtN3FnorBmC8,10998
 fresco/tests/test_request.py,sha256=hoANrergrohlAeTbQufDMfIbvYURsPyPjCxOVKz7bVo,16389
 fresco/tests/test_requestcontext.py,sha256=t8hm-lzIk85ryb3sdlpVoPQyLDWpCjB86dg8nVG1yRw,3115
 fresco/tests/test_response.py,sha256=MrhHIDg81pJlTeEcn2rGtU-i59s1KzEccF81u4Up6xs,8934
@@ -50,8 +50,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=2cr2b92RpvPSgS_P46X2mlYepoFg9Qji-V-fzxpSNzw,12971
-fresco-3.3.3.dist-info/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-fresco-3.3.3.dist-info/METADATA,sha256=Yze5uNMocy7RORadQyMAjKAm5W2FMkN3DYaqc7cA470,1549
-fresco-3.3.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-fresco-3.3.3.dist-info/top_level.txt,sha256=p_1aMce5Shjq9fIfdbB-aN8wCDhjF_iYnn98bUebbII,7
-fresco-3.3.3.dist-info/RECORD,,
+fresco-3.3.4.dist-info/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+fresco-3.3.4.dist-info/METADATA,sha256=v9NcXIhYp5MqENOecCV7XIsFrg7sC9GdRmIHuS912HI,1549
+fresco-3.3.4.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+fresco-3.3.4.dist-info/top_level.txt,sha256=p_1aMce5Shjq9fIfdbB-aN8wCDhjF_iYnn98bUebbII,7
+fresco-3.3.4.dist-info/RECORD,,

{fresco-3.3.3.dist-info → fresco-3.3.4.dist-info}/WHEEL

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