c2cgeoportal-commons 2.8.1.146__py3-none-any.whl → 2.9.0.350__py3-none-any.whl

c2cgeoportal_commons/lib/url.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023, Camptocamp SA
+# Copyright (c) 2013-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -28,11 +28,10 @@
 import logging
 import re
 import urllib.parse
-from typing import Dict, Optional, Set
 
 from pyramid.request import Request
 
-LOG = logging.getLogger(__name__)
+_LOG = logging.getLogger(__name__)
 
 
 class Url:
@@ -40,13 +39,13 @@ class Url:
 
     scheme = ""
     _netloc = ""
-    _hostname: Optional[str] = None
-    _port: Optional[int] = None
+    _hostname: str | None = None
+    _port: int | None = None
     path = ""
-    query: Dict[str, str] = {}
+    query: dict[str, str] = {}
     fragment = ""
 
-    def __init__(self, url: Optional[str] = None):
+    def __init__(self, url: str | None = None):
         if url:
             url_split = urllib.parse.urlsplit(url)
             self.scheme = url_split.scheme
@@ -55,7 +54,7 @@ class Url:
             try:
                 self._port = url_split.port
             except ValueError as error:
-                LOG.debug(error)
+                _LOG.debug(error)
             self.path = url_split.path
             self.query = dict(urllib.parse.parse_qsl(url_split.query))
             self.fragment = url_split.fragment
@@ -94,7 +93,7 @@ class Url:
         if len(netloc_split) == 2:
             allowed = re.compile(r"^[0-9]+$")
             if not allowed.match(netloc_split[1]):
-                LOG.debug("The netloc '%s' contains invalid port", netloc)
+                _LOG.debug("The netloc '%s' contains invalid port", netloc)
                 self._port = None
             else:
                 self._port = int(netloc_split[1])
@@ -104,7 +103,7 @@ class Url:
         self._hostname = netloc_split[0]
 
     @property
-    def hostname(self) -> Optional[str]:
+    def hostname(self) -> str | None:
         return self._hostname
 
     @hostname.setter
@@ -115,15 +114,15 @@ class Url:
         self.netloc = hostname if self._port is None else f"{hostname}:{self._port}"
 
     @property
-    def port(self) -> Optional[int]:
+    def port(self) -> int | None:
         return self._port
 
     @port.setter
-    def port(self, port: Optional[int]) -> None:
+    def port(self, port: int | None) -> None:
         self._port = port
         self.netloc = (self._hostname or "") if port is None else f"{self._hostname}:{port}"
 
-    def add_query(self, query: Dict[str, str], force: bool = False) -> "Url":
+    def add_query(self, query: dict[str, str], force: bool = False) -> "Url":
         if query:
             for key, value in query.items():
                 if force or key not in self.query:
@@ -131,7 +130,7 @@ class Url:
         return self
 
     @property
-    def query_lower(self) -> Dict[str, str]:
+    def query_lower(self) -> dict[str, str]:
         return {k.lower(): v for k, v in self.query.items()}
 
     def url(self) -> str:
@@ -153,8 +152,8 @@ class Url:
 
 
 def get_url2(
-    name: str, url: str, request: Request, errors: Set[str], servers: Optional[Dict[str, str]] = None
-) -> Optional[Url]:
+    name: str, url: str, request: Request, errors: set[str], servers: dict[str, str] | None = None
+) -> Url | None:
     """
     Get the real URL from the URI of the administration interface.
 

c2cgeoportal_commons/lib/validators.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023, Camptocamp SA
+# Copyright (c) 2019-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without

c2cgeoportal_commons/models/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023, Camptocamp SA
+# Copyright (c) 2011-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -27,10 +27,11 @@
 
 
 import logging
-from typing import Any, Dict, List
+from typing import Any
 
 import sqlalchemy.ext.declarative
 import sqlalchemy.orm
+import sqlalchemy.orm.scoping
 import zope.event
 
 try:
@@ -42,19 +43,25 @@ except ModuleNotFoundError:
 
 
 # Should be filed on application initialization
-DBSession: sqlalchemy.orm.Session = None
-Base: sqlalchemy.ext.declarative.ConcreteBase = sqlalchemy.ext.declarative.declarative_base()
-DBSessions: Dict[str, sqlalchemy.orm.Session] = {}
+DBSession: sqlalchemy.orm.scoping.scoped_session[sqlalchemy.orm.Session] | None = None
 
 
-LOG = logging.getLogger(__name__)
+class BaseType(sqlalchemy.ext.declarative.DeclarativeMeta, type):
+    pass
+
+
+Base: BaseType = sqlalchemy.orm.declarative_base()
+DBSessions: dict[str, sqlalchemy.orm.scoping.scoped_session[sqlalchemy.orm.Session]] = {}
+
+
+_LOG = logging.getLogger(__name__)
 
 
 class InvalidateCacheEvent:
     """Event to be broadcast."""
 
 
-def cache_invalidate_cb(*args: List[Any]) -> None:
+def cache_invalidate_cb(*args: list[Any]) -> None:
     """Invalidate the cache on a broadcast event."""
     _cache_invalidate_cb()
 
@@ -67,4 +74,4 @@ try:
         zope.event.notify(InvalidateCacheEvent())
 
 except ModuleNotFoundError:
-    LOG.error("c2cwsgiutils broadcast not found")
+    _LOG.error("c2cwsgiutils broadcast not found")