c2cgeoportal-geoportal 2.6.0__py2.py3-none-any.whl → 2.8.1.180__py2.py3-none-any.whl

tests/test_caching.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2015-2019, Camptocamp SA
+# Copyright (c) 2015-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -35,13 +33,8 @@ from unittest import TestCase
 from tests import DummyRequest
 
 from c2cgeoportal_geoportal.lib.cacheversion import get_cache_version
-from c2cgeoportal_geoportal.lib.caching import (
-    CORS_METHODS,
-    NO_CACHE,
-    init_region,
-    invalidate_region,
-    set_common_headers,
-)
+from c2cgeoportal_geoportal.lib.caching import init_region, invalidate_region
+from c2cgeoportal_geoportal.lib.common_headers import CORS_METHODS, Cache, set_common_headers
 
 
 class TestSetCorsHeaders(TestCase):
@@ -57,31 +50,31 @@ class TestSetCorsHeaders(TestCase):
             request.registry.settings = {"headers": {"foo": settings}}
         else:
             request.registry.settings = {"headers": {}}
-        set_common_headers(request, "foo", NO_CACHE, credentials=credentials)
+        set_common_headers(request, "foo", Cache.PRIVATE_NO, credentials=credentials)
 
         return dict(request.response.headers)
 
     def test_simple(self):
         """
-        Tests specified in http://www.w3.org/TR/cors/#resource-requests
+        Tests specified in http://www.w3.org/TR/cors/#resource-requests.
         """
         # 1. If the Origin header is not present terminate this set of steps.
         #    The request is outside the scope of this specification.
         assert self._do("POST", {}) == {
-            "Cache-Control": "max-age=0, no-cache",
+            "Cache-Control": "max-age=10, private",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Cookie",
         }
 
         # 2. If the value of the Origin header is not a case-sensitive match for
         #    any of the values in list of origins, do not set any additional
         #    headers and terminate this set of steps.
         assert self._do("POST", {"Origin": "http://foe.com"}) == {
-            "Cache-Control": "max-age=0, no-cache",
+            "Cache-Control": "max-age=10, private",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Cookie",
         }
 
         # 3. If the resource supports credentials add a single
@@ -89,10 +82,10 @@ class TestSetCorsHeaders(TestCase):
         #    header as value, and add a single Access-Control-Allow-Credentials
         #    header with the case-sensitive string "true" as value.
         assert self._do("POST", {"Origin": self.ORIGIN2}, credentials=True) == {
-            "Cache-Control": "max-age=0, no-cache",
+            "Cache-Control": "max-age=10, private",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Cookie",
             "Access-Control-Max-Age": self.MAX_AGE,
             "Access-Control-Allow-Origin": self.ORIGIN2,
             "Access-Control-Allow-Methods": CORS_METHODS,
@@ -110,8 +103,7 @@ class TestSetCorsHeaders(TestCase):
 
     def test_preflight(self):
         """
-        Tests specified in
-        http://www.w3.org/TR/cors/#resource-preflight-requests
+        Tests specified in http://www.w3.org/TR/cors/#resource-preflight-requests.
         """
         # 1. If the Origin header is not present terminate this set of steps.
         #    The request is outside the scope of this specification.
@@ -210,10 +202,10 @@ class TestSetCorsHeaders(TestCase):
     def test_not_configured(self):
         # If the service is not configured, then no CORS head.
         assert self._do("GET", {"Origin": self.ORIGIN1}, settings=None) == {
-            "Cache-Control": "max-age=0, no-cache",
+            "Cache-Control": "max-age=10, private",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Cookie",
         }
 
     def test_match_all(self):
@@ -225,10 +217,10 @@ class TestSetCorsHeaders(TestCase):
         # An origin included in the access_control_allow_origin list is OK with
         # credentials
         assert self._do("POST", {"Origin": self.ORIGIN1}, credentials=True, settings=settings) == {
-            "Cache-Control": "max-age=0, no-cache",
+            "Cache-Control": "max-age=10, private",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Cookie",
             "Access-Control-Max-Age": self.MAX_AGE,
             "Access-Control-Allow-Origin": self.ORIGIN1,
             "Access-Control-Allow-Methods": CORS_METHODS,
@@ -238,10 +230,10 @@ class TestSetCorsHeaders(TestCase):
         # 3. Otherwise, add a single Access-Control-Allow-Origin header, with
         #    either the value of the Origin header or the string "*" as value.
         assert self._do("POST", {"Origin": "http://www.guest.com"}, settings=settings) == {
-            "Cache-Control": "max-age=0, no-cache",
+            "Cache-Control": "max-age=10, private",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Cookie",
             "Access-Control-Max-Age": self.MAX_AGE,
             "Access-Control-Allow-Origin": "*",
             "Access-Control-Allow-Methods": CORS_METHODS,

tests/test_checker.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2013-2019, Camptocamp SA
+# Copyright (c) 2013-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without

tests/test_decimaljson.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2011-2019, Camptocamp SA
+# Copyright (c) 2011-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -34,14 +32,16 @@ import decimal
 import json
 from unittest import TestCase
 
-from c2cwsgiutils.pretty_json import fast_dumps
+from c2cwsgiutils.pretty_json import _FastDumps as FastDumps
 
 
 class TestDecimalJSON(TestCase):
     def test_decimal(self):
         value = {"str": "an str", "int": 1, "dec": decimal.Decimal("1.2")}
+        fast_dumps = FastDumps(False, False)
         result = fast_dumps(value)
         self.assertEqual(json.loads(result), {"int": 1, "dec": 1.2, "str": "an str"})
 
     def test_decimal_json(self):
-        self.assertEqual(fast_dumps({"a": decimal.Decimal("3.3")}), '{\n  "a": 3.3\n}')
+        fast_dumps = FastDumps(False, False)
+        assert fast_dumps({"a": decimal.Decimal("3.3")}) == '{"a":3.3}'

tests/test_headerstween.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2018-2019, Camptocamp SA
+# Copyright (c) 2018-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without

tests/test_i18n.py

@@ -24,8 +24,8 @@ class TestI18n(TestCase):
     )
     def test_available_locale_names(self, isdir_mock, listdir_mock, exists_mock):
         locales = available_locale_names()
-        self.assertEqual(set(locales), set(["de", "en", "fr"]))
+        self.assertEqual(set(locales), {"de", "en", "fr"})
 
     def test_available_locale_names_no_dir(self):
         locales = available_locale_names()
-        self.assertEqual(locales, [])
+        assert locales == []

tests/test_init.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2012-2019, Camptocamp SA
+# Copyright (c) 2012-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -42,13 +40,12 @@ from c2cgeoportal_geoportal import (
     call_hook,
     create_get_user_from_request,
     default_user_validator,
-    is_valid_referer,
+    is_valid_referrer,
     set_user_validator,
 )
 
 
 class TestIncludeme(TestCase):
-
     config = None
 
     def setup_method(self, _):
@@ -87,7 +84,7 @@ class TestIncludeme(TestCase):
 
     def test_default_user_validator(self):
         self.config.include(c2cgeoportal_geoportal.includeme)
-        self.assertEqual(self.config.registry.validate_user, default_user_validator)
+        assert self.config.registry.validate_user == default_user_validator
 
     def test_user_validator_overwrite(self):
         self.config.include(c2cgeoportal_geoportal.includeme)
@@ -95,16 +92,15 @@ class TestIncludeme(TestCase):
         def custom_validator(username, password):
             del username  # Unused
             del password  # Unused
-            return False  # pragma: no cover
+            return False
 
         self.config.set_user_validator(custom_validator)
-        self.assertEqual(self.config.registry.validate_user, custom_validator)
+        assert self.config.registry.validate_user == custom_validator
 
 
 class TestReferer(TestCase):
     """
-    Check that accessing something with a bad HTTP referer is equivalent to a
-    not authenticated query.
+    Check that accessing something with a bad HTTP referrer is equivalent to a not authenticated query.
     """
 
     BASE1 = "http://example.com/app"
@@ -116,7 +112,7 @@ class TestReferer(TestCase):
         class MockRequest:
             def __init__(self, to, ref, method):
                 self.path_qs = to
-                self.referer = ref
+                self.referrer = ref
                 self.user_ = TestReferer.USER
                 self.method = method
 
@@ -127,8 +123,8 @@ class TestReferer(TestCase):
     def test_match_url(self):
         def match(reference, value, expected):
             r = DummyRequest()
-            r.referer = value
-            self.assertEqual(is_valid_referer(r, {"authorized_referers": [reference]}), expected)
+            r.referrer = value
+            assert is_valid_referrer(r, {"authorized_referers": [reference]}) == expected
 
         match("http://example.com/app/", "http://example.com/app?k=v", True)
         match("http://example.com/app/", "http://example.com/app?k=v#link", True)
@@ -143,16 +139,16 @@ class TestReferer(TestCase):
         match("http://example.com", "http://example.com.bad.org/app/x/y", False)
 
     def test_positive(self):
-        self.assertEqual(self._get_user(to=self.BASE1 + "/1", ref=self.BASE1), self.USER)
-        self.assertEqual(self._get_user(to=self.BASE1 + "/2", ref=self.BASE1 + "/3"), self.USER)
-        self.assertEqual(self._get_user(to=self.BASE1 + "/4", ref=self.BASE2 + "/5"), self.USER)
+        assert self._get_user(to=self.BASE1 + "/1", ref=self.BASE1) == self.USER
+        assert self._get_user(to=self.BASE1 + "/2", ref=self.BASE1 + "/3") == self.USER
+        assert self._get_user(to=self.BASE1 + "/4", ref=self.BASE2 + "/5") == self.USER
 
     def test_no_ref(self):
-        self.assertEqual(self._get_user(to=self.BASE1, ref=None), self.USER)
-        self.assertIsNone(self._get_user(to=self.BASE1, ref=""))
+        assert self._get_user(to=self.BASE1, ref=None) == self.USER
+        assert self._get_user(to=self.BASE1, ref="") is None
 
-        self.assertEqual(self._get_user(to=self.BASE1, ref=None, method="POST"), self.USER)
-        self.assertIsNone(self._get_user(to=self.BASE1, ref="", method="POST"))
+        assert self._get_user(to=self.BASE1, ref=None, method="POST") == self.USER
+        assert self._get_user(to=self.BASE1, ref="", method="POST") is None
 
     def test_bad_ref(self):
         self.assertIsNone(self._get_user(to=self.BASE1, ref="http://bad.com/hacker"))

tests/test_locale_negociator.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2013-2019, Camptocamp SA
+# Copyright (c) 2013-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -41,7 +39,7 @@ class TestLocalNegociator(TestCase):
 
         request = DummyRequest(params=dict(lang="fr"))
         lang = locale_negotiator(request)
-        self.assertEqual(lang, "fr")
+        assert lang == "fr"
 
     def test_lang_is_not_available(self):
         from pyramid.request import Request
@@ -55,7 +53,7 @@ class TestLocalNegociator(TestCase):
 
         request.headers["accept-language"] = "en-us,en;q=0.3,fr;q=0.7"
         lang = locale_negotiator(request)
-        self.assertEqual(lang, "de")
+        assert lang == "de"
 
     def test_lang_is_available(self):
         from pyramid.request import Request
@@ -68,4 +66,4 @@ class TestLocalNegociator(TestCase):
         request.registry.settings = {"default_locale_name": "de", "available_locale_names": ["de", "es"]}
         request.accept_language = "en-us,en;q=0.3,es;q=0.7"
         lang = locale_negotiator(request)
-        self.assertEqual(lang, "es")
+        assert lang == "es"

tests/test_mapserverproxy_route_predicate.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2013-2019, Camptocamp SA
+# Copyright (c) 2013-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -39,7 +37,6 @@ from c2cgeoportal_geoportal import MapserverproxyRoutePredicate
 
 
 class TestMapserverproxyRoutePredicate(TestCase):
-
     predicate = MapserverproxyRoutePredicate(None, None)
 
     def test_hide_capabilities_unset(self):

tests/test_raster.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2013-2021, Camptocamp SA
+# Copyright (c) 2013-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -55,9 +53,9 @@ class TestRasterViews(TestCase):
         request.params["lon"] = "565000"
         request.params["lat"] = "218000"
         result = raster.raster()
-        self.assertEqual(result["dem1"], None)
-        self.assertEqual(result["dem2"], None)
-        self.assertEqual(result["dem3"], None)
+        assert result["dem1"] == None
+        assert result["dem2"] == None
+        assert result["dem3"] == None
 
         request.params["lon"] = "548000"
         request.params["lat"] = "216000"
@@ -99,27 +97,27 @@ class TestRasterViews(TestCase):
         request.params["lon"] = "547990.0"
         request.params["lat"] = "216009.1"
         result = raster.raster()
-        self.assertEqual(result["dem5"], Decimal("1164.2"))
+        assert result["dem5"] == Decimal("1164.2")
         request.params["lon"] = "547990.9"
         request.params["lat"] = "216010.0"
         result = raster.raster()
-        self.assertEqual(result["dem5"], Decimal("1164.2"))
+        assert result["dem5"] == Decimal("1164.2")
 
         # Lower right
         request.params["lon"] = "547996.0"
         request.params["lat"] = "216003.1"
         result = raster.raster()
-        self.assertEqual(result["dem5"], Decimal("1180.77"))
+        assert result["dem5"] == Decimal("1180.77")
         request.params["lon"] = "547996.9"
         request.params["lat"] = "216004.0"
         result = raster.raster()
-        self.assertEqual(result["dem5"], Decimal("1180.77"))
+        assert result["dem5"] == Decimal("1180.77")
 
         # Out
         request.params["lon"] = "547997.4"
         request.params["lat"] = "216003.5"
         result = raster.raster()
-        self.assertEqual(result["dem5"], None)
+        assert result["dem5"] == None
 
     def test_raster_vrt(self):
         from decimal import Decimal
@@ -144,7 +142,7 @@ class TestRasterViews(TestCase):
         request.params["lon"] = "547990.4"
         request.params["lat"] = "216009.5"
         result = raster.raster()
-        self.assertEqual(result["dem6"], Decimal("1164.2"))
+        assert result["dem6"] == Decimal("1164.2")
 
     def test_absolute_path(self):
         import fiona
@@ -179,7 +177,7 @@ class TestRasterViews(TestCase):
             '{"type":"LineString",' '"coordinates":[[548009.5,215990],[547990,216009.5]]}'
         )
         result = profile.json()
-        self.assertEqual(len(result["profile"]), 4)
+        assert len(result["profile"]) == 4
         self.assertAlmostEqual(result["profile"][0]["y"], 215990)
         self.assertAlmostEqual(result["profile"][0]["values"]["dem2"], None)
         self.assertAlmostEqual(result["profile"][0]["values"]["dem"], None)
@@ -203,7 +201,7 @@ class TestRasterViews(TestCase):
 
         request.params["layers"] = "dem"
         result = profile.json()
-        self.assertEqual(len(result["profile"]), 4)
+        assert len(result["profile"]) == 4
         self.assertAlmostEqual(result["profile"][0]["y"], 215990)
         self.assertAlmostEqual(result["profile"][0]["values"]["dem"], None)
         self.assertAlmostEqual(result["profile"][0]["dist"], Decimal("0.0"))
@@ -224,7 +222,7 @@ class TestRasterViews(TestCase):
         # test length = 0
         request.params["geom"] = '{"type":"LineString",' '"coordinates":[[548000,216000]]}'
         result = profile.json()
-        self.assertEqual(len(result["profile"]), 1)
+        assert len(result["profile"]) == 1
         self.assertAlmostEqual(result["profile"][0]["y"], 216000)
         self.assertAlmostEqual(result["profile"][0]["values"]["dem"], 1172)
         self.assertAlmostEqual(result["profile"][0]["dist"], Decimal("0.0"))
@@ -235,7 +233,7 @@ class TestRasterViews(TestCase):
             '{"type":"LineString",' '"coordinates":[[548000,216000],[548001,216001],[548009,216009]]}'
         )
         result = profile.json()
-        self.assertEqual(len(result["profile"]), 5)
+        assert len(result["profile"]) == 5
         self.assertAlmostEqual(result["profile"][0]["y"], 216000)
         self.assertAlmostEqual(result["profile"][0]["values"]["dem"], 1172)
         self.assertAlmostEqual(result["profile"][0]["dist"], Decimal("0.0"))
@@ -243,7 +241,7 @@ class TestRasterViews(TestCase):
         self.assertAlmostEqual(result["profile"][1]["y"], 216001.0)
         self.assertAlmostEqual(result["profile"][1]["values"]["dem"], 1167)
         self.assertAlmostEqual(result["profile"][1]["dist"], Decimal("1.4"))
-        self.assertEqual(result["profile"][1]["x"], 548001.0)
+        assert result["profile"][1]["x"] == 548001.0
         self.assertAlmostEqual(result["profile"][2]["y"], 216003.66666666666)
         self.assertAlmostEqual(result["profile"][2]["values"]["dem"], 1155)
         self.assertAlmostEqual(result["profile"][2]["dist"], Decimal("5.2"))

tests/test_wmstparsing.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2013-2019, Camptocamp SA
+# Copyright (c) 2013-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -123,35 +121,35 @@ class TestParseDate(TestCase):
         from c2cgeoportal_geoportal.lib.wmstparsing import _parse_date
 
         date = _parse_date("2010")
-        self.assertEqual("year", date[0])
+        assert "year" == date[0]
         self.assertEqual(datetime.datetime(2010, 0o1, 0o1, tzinfo=isodate.UTC), date[1])
 
     def test_parse_date_month(self):
         from c2cgeoportal_geoportal.lib.wmstparsing import _parse_date
 
         date = _parse_date("2010-02")
-        self.assertEqual("month", date[0])
+        assert "month" == date[0]
         self.assertEqual(datetime.datetime(2010, 0o2, 0o1, tzinfo=isodate.UTC), date[1])
 
     def test_parse_date(self):
         from c2cgeoportal_geoportal.lib.wmstparsing import _parse_date
 
         date = _parse_date("2010-02-03")
-        self.assertEqual("day", date[0])
+        assert "day" == date[0]
         self.assertEqual(datetime.datetime(2010, 0o2, 0o3, tzinfo=isodate.UTC), date[1])
 
     def test_parse_datetime(self):
         from c2cgeoportal_geoportal.lib.wmstparsing import _parse_date
 
         date = _parse_date("2010-02-03T12:34")
-        self.assertEqual("second", date[0])
+        assert "second" == date[0]
         self.assertEqual(datetime.datetime(2010, 0o2, 0o3, 12, 34, tzinfo=isodate.UTC), date[1])
 
     def test_parse_datetime_tz(self):
         from c2cgeoportal_geoportal.lib.wmstparsing import _parse_date
 
         date = _parse_date("2010-02-03T12:34Z")
-        self.assertEqual("second", date[0])
+        assert "second" == date[0]
         self.assertEqual(datetime.datetime(2010, 0o2, 0o3, 12, 34, tzinfo=isodate.UTC), date[1])
 
     def test_unsupported_format(self):
@@ -165,13 +163,13 @@ class TestFormat(TestCase):
         from c2cgeoportal_geoportal.lib.wmstparsing import _format_date
 
         dt = datetime.datetime(2010, 0o2, 0o1, 00, 00)
-        self.assertEqual("2010-02-01T00:00:00Z", _format_date(dt))
+        assert "2010-02-01T00:00:00Z" == _format_date(dt)
 
     def test_format_tz(self):
         from c2cgeoportal_geoportal.lib.wmstparsing import _format_date, _parse_date
 
         dt = _parse_date("2010-02-03T12:34:00+01:00")
-        self.assertEqual("2010-02-03T12:34:00+01:00", _format_date(dt[1]))
+        assert "2010-02-03T12:34:00+01:00" == _format_date(dt[1])
 
 
 class TestParseDuration(TestCase):
@@ -221,9 +219,9 @@ class TestTimeInformation(TestCase):
         self.assertFalse(ti.has_time())
         self.assertTrue(ti.to_dict() is None)
         ti.merge_mode("single")
-        self.assertEqual(ti.mode, "single")
+        assert ti.mode == "single"
         ti.merge_mode("single")
-        self.assertEqual(ti.mode, "single")
+        assert ti.mode == "single"
 
     def test_merge_different_modes(self):
         from c2cgeoportal_geoportal.lib.wmstparsing import TimeInformation

tests/xmlstr.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2013-2019, Camptocamp SA
+# Copyright (c) 2013-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without