c2cwsgiutils 5.0.1__py3-none-any.whl → 5.0.4__py3-none-any.whl

c2cwsgiutils/acceptance/composition.py

@@ -24,7 +24,7 @@ def _try(what: Callable[[], Any], fail: bool = True, times: int = 5, delay: int
     for i in range(times):
         try:
             return what()
-        except:  # noqa: bare-except
+        except:  # noqa: bare-except # pylint: disable=bare-except
             LOG.warning("Exception:", exc_info=True)
             if i + 1 == times and fail:
                 raise

c2cwsgiutils/broadcast/redis.py

@@ -6,7 +6,7 @@ import threading
 import time
 from typing import Any, Callable, List, Mapping, Optional
 
-import redis  # pylint: disable=unused-import
+import redis
 
 from c2cwsgiutils.broadcast import interface, local, utils
 

c2cwsgiutils/client_info.py

@@ -1,3 +1,4 @@
+import os
 import re
 from typing import Any, Callable, Dict
 
@@ -22,6 +23,15 @@ class Filter:
         else:
             _handle_others(environ)
 
+        if "C2CWSGIUTILS_FORCE_PROTO" in os.environ:
+            environ["wsgi.url_scheme"] = os.environ["C2CWSGIUTILS_FORCE_PROTO"]
+        if "C2CWSGIUTILS_FORCE_HOST" in os.environ:
+            environ["HTTP_HOST"] = os.environ["C2CWSGIUTILS_FORCE_HOST"]
+        if "C2CWSGIUTILS_FORCE_SERVER_NAME" in os.environ:
+            environ["SERVER_NAME"] = os.environ["C2CWSGIUTILS_FORCE_SERVER_NAME"]
+        if "C2CWSGIUTILS_FORCE_REMOTE_ADDR" in os.environ:
+            environ["REMOTE_ADDR"] = os.environ["C2CWSGIUTILS_FORCE_REMOTE_ADDR"]
+
         return self._application(environ, start_response)
 
 

c2cwsgiutils/db.py

@@ -2,7 +2,7 @@
 import logging
 import re
 import warnings
-from typing import Pattern  # noqa  # pylint: disable=unused-import
+from typing import Pattern  # noqa
 from typing import Any, Callable, Iterable, Optional, Tuple, Union, cast
 
 import pyramid.config
@@ -190,7 +190,7 @@ def _add_tween(
 
         return db_chooser_tween
 
-    tweens.__setattr__(name, db_chooser_tween_factory)
+    tweens.__setattr__(name, db_chooser_tween_factory)  # pylint: disable=unnecessary-dunder-call
     config.add_tween("c2cwsgiutils.db.tweens." + name, over="pyramid_tm.tm_tween_factory")
 
 

c2cwsgiutils/prometheus.py

@@ -1,4 +1,4 @@
-from typing import Any, Mapping, MutableMapping, Optional  # noqa  # pylint: disable=unused-import
+from typing import Any, Mapping, MutableMapping, Optional  # noqa
 
 import requests
 

c2cwsgiutils/pyramid_logging.py

@@ -101,7 +101,7 @@ class PyramidCeeSysLogHandler(cee_syslog_handler.CeeSysLogHandler):  # type: ign
 
 
 if TYPE_CHECKING:
-    Base = logging.StreamHandler[IO[str]]  # pylint: disable=unsubscriptable-object
+    Base = logging.StreamHandler[IO[str]]
 else:
     Base = logging.StreamHandler
 

c2cwsgiutils/redis_stats.py

@@ -1,6 +1,6 @@
 import logging
 import warnings
-from typing import Any, Callable, Dict, Optional  # noqa  # pylint: disable=unused-import
+from typing import Any, Callable, Dict, Optional  # noqa
 
 import pyramid.config
 

c2cwsgiutils/redis_utils.py

@@ -83,7 +83,7 @@ def _init(settings: Optional[Mapping[str, Any]]) -> None:
             print(_sentinel.sentinels[0].sentinel_masters())
             raise Exception(_sentinel.sentinels[0].sentinel_masters()) from error
     if url:
-        if not url.startswith("redis://"):
+        if "://" not in url:
             url = "redis://" + url
 
         LOG.info("Redis setup using: %s, with options: %s", url, redis_options_)

c2cwsgiutils/request_tracking/__init__.py

@@ -7,7 +7,7 @@ import logging
 import urllib.parse
 import uuid
 import warnings
-from typing import Any, Dict, List, Optional, Sequence  # noqa  # pylint: disable=unused-import
+from typing import Any, Dict, List, Optional, Sequence  # noqa
 
 import pyramid.request
 import requests.adapters

c2cwsgiutils/sentry.py

@@ -2,7 +2,7 @@ import contextlib
 import logging
 import os
 import warnings
-from typing import Any, Callable, Generator, MutableMapping, Optional  # noqa  # pylint: disable=unused-import
+from typing import Any, Callable, Generator, MutableMapping, Optional  # noqa
 
 import pyramid.config
 import sentry_sdk

c2cwsgiutils/sqlalchemylogger/handlers.py

@@ -76,7 +76,7 @@ class SQLAlchemyHandler(logging.Handler):
         try:
             self.session.bulk_save_objects(logs)
             self.session.commit()
-        except (SQLAlchemyError):
+        except SQLAlchemyError:
             try:
                 self.create_db()
                 self.session.rollback()

c2cwsgiutils/stats.py

@@ -8,7 +8,7 @@ import socket
 import threading
 import time
 from abc import ABCMeta, abstractmethod
-from typing import (  # noqa  # pylint: disable=unused-import
+from typing import (  # noqa
     Any,
     Callable,
     Dict,

{c2cwsgiutils-5.0.1.dist-info → c2cwsgiutils-5.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cwsgiutils
-Version: 5.0.1
+Version: 5.0.4
 Summary: Common utilities for Camptocamp WSGI applications
 Home-page: https://github.com/camptocamp/c2cwsgiutils
 Author: Camptocamp
@@ -48,7 +48,6 @@ Requires-Dist: zope.sqlalchemy ; extra == 'standard'
 Requires-Dist: pyyaml ; extra == 'standard'
 Requires-Dist: pyjwt ; extra == 'standard'
 Requires-Dist: requests-oauthlib ; extra == 'standard'
-Requires-Dist: setuptools ; extra == 'standard'
 Requires-Dist: waitress ; extra == 'standard'
 Requires-Dist: certifi ; extra == 'standard'
 Requires-Dist: charset-normalizer ; extra == 'standard'
@@ -745,3 +744,10 @@ To make a release:
 - Tag the GIT commit.
 - Add the new branch name in the `.github/workflows/rebuild.yaml` and
   `.github/workflows/audit.yaml` files.
+
+## Pserve
+
+Pserve will not set the headers in the environment then if you are behind a reverse proxy, you will have
+wrong values in client information, you can force them by using the environment variables:
+`C2CWSGIUTILS_FORCE_PROTO`, `C2CWSGIUTILS_FORCE_HOST` `C2CWSGIUTILS_FORCE_SERVER_NAME` and
+`C2CWSGIUTILS_FORCE_REMOTE_ADDR`.

{c2cwsgiutils-5.0.1.dist-info → c2cwsgiutils-5.0.4.dist-info}/RECORD

@@ -1,9 +1,9 @@
 c2cwsgiutils/__init__.py,sha256=GAp4F7ZzG07CJKSO64i0JUlCMQklx2OGRZgDbU4rFiY,803
 c2cwsgiutils/auth.py,sha256=KG-J0usHVpVw0Tz7LUOdhsF2gjMF-6S_w5Fmvg1rDro,6487
-c2cwsgiutils/client_info.py,sha256=k1jTv3_NVLeMgJURjcgUbH4tmHPjW39UuOWXPJF7DN8,3050
+c2cwsgiutils/client_info.py,sha256=YFteIwNamIc3LIsaYv2C1MZRS6crJYoId5TgxYNvDSw,3601
 c2cwsgiutils/config_utils.py,sha256=aN_New-YukyZ08--z2CsjTSS6YfDsI5pc_ciNewjxS0,1496
 c2cwsgiutils/coverage_setup.py,sha256=jg_SAgEZnOqbZvbenyES6ReO3bRS8YyNM3qUzjpch6I,839
-c2cwsgiutils/db.py,sha256=zYnjiDEiVR4xZJb5Tull2vASFRW3iA5VWf2ZrNuvonY,15315
+c2cwsgiutils/db.py,sha256=q8kAxzA36cR1W-QtPcXagWSwDbCoDJhoQ12QckpdQQ8,15325
 c2cwsgiutils/db_maintenance_view.py,sha256=Br9EnG4wfFCh5-vWGY86be9iCQmS8Z3dg-n0F0Qp_wc,3049
 c2cwsgiutils/errors.py,sha256=XlWZOA20bfog1l6vg0mHzgmpCI7zK6qQ5qPVxPhk6FI,6670
 c2cwsgiutils/health_check.py,sha256=JCHm1GLus5dQiKblKpk6jpg4WpIqxCku63eKFl-VTXE,20317
@@ -14,32 +14,32 @@ c2cwsgiutils/metrics.py,sha256=6Fx6ZjVuy40X5pLLlgflgd1hQYTCxm2OMweyXvLEUUI,3425
 c2cwsgiutils/models_graph.py,sha256=jqw3Ua0sMUhi1Kp4AwiqwuwpB8JYqEEUVaUmicO1HIc,2653
 c2cwsgiutils/pretty_json.py,sha256=sNRRSRtdOm6EzkBJgGbA4gBHuqsLMjq6U5mYabi_eT0,1441
 c2cwsgiutils/profiler.py,sha256=6eSg-_WJKPOQ07rmfVsrfD3lUfbniJoXukkNRUY9PB0,1316
-c2cwsgiutils/prometheus.py,sha256=2Qzyuy7PSincyRU55V1uxtJRG7ZxCdWkvzfVE9KRNaA,2103
+c2cwsgiutils/prometheus.py,sha256=lsREO4k0nJujIQIeHwmPabMycZQwghBhJo425wpH2tY,2070
 c2cwsgiutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 c2cwsgiutils/pyramid.py,sha256=VmrAMFpC636WTToNNaI9hWQOYJAk5hn__K43mBvUFtw,1346
-c2cwsgiutils/pyramid_logging.py,sha256=fUQSGjnM5iL6-AsfuwwZbzhxsuMsdOzP2h38sccf6Rk,3716
-c2cwsgiutils/redis_stats.py,sha256=CtOcpYTHK5xUG4PWtZldbd_u2KEjZtZK_9NNmLfKvO0,1520
-c2cwsgiutils/redis_utils.py,sha256=3SLzaJbKdcq_m2mT0_Hei3hs2iZXscXjuDmqKtOCdqk,4760
-c2cwsgiutils/sentry.py,sha256=Yu1lygHOWS8bmPNrUqV7XUr6xxI55JN9LVDxtAcXPeE,5043
+c2cwsgiutils/pyramid_logging.py,sha256=8_67MGoSdq_5OUGns63f4FfWjYcRCM1GzQAxIqEg45c,3674
+c2cwsgiutils/redis_stats.py,sha256=pIQTJRRWPRPTX5ch605dIDPkJVwVY2GRMQcvelWVs1E,1487
+c2cwsgiutils/redis_utils.py,sha256=j8uhxaLOTpxnPQPorrxG3SFrQNebxmMlIioZY0rXDWg,4746
+c2cwsgiutils/sentry.py,sha256=iAs6MhdoRU5LPf4rbmgRfs9JCqhojrk-OGdgjAu86QI,5010
 c2cwsgiutils/services.py,sha256=Qajsjrxcasieed2_W3AGCYpmQOrKxAqSK5s5o-UScPo,1559
 c2cwsgiutils/setup_process.py,sha256=z5pd4Ry13_IA-vXdILQmro2VZI2X9tCyT_sj2vHwXVw,2825
-c2cwsgiutils/stats.py,sha256=je576MT95MJPKIXGZlK_gf6kQ31YB9wWSc_6A7UJpYw,11558
+c2cwsgiutils/stats.py,sha256=_4BKFDCeyOOQHRvMu4PGqBWwkybqlbQl7SCA27WpRdc,11525
 c2cwsgiutils/version.py,sha256=ddTMRafXaPF4LyPZz50PjoqmT34lclLSH1_EHVbTnoU,1818
 c2cwsgiutils/acceptance/__init__.py,sha256=vjtpPfu0kbXUOYMx15Z8713IfPFZA9XnkUKkIFtVj_M,1500
-c2cwsgiutils/acceptance/composition.py,sha256=TBq5BdA14nG-7VVFq2-chD-hOY0C575hIZH0ytrjXOU,4610
+c2cwsgiutils/acceptance/composition.py,sha256=APDMwsehzqsLz-D5B-YVd3Ie3rzkZmhxl5cBvAxVCRQ,4640
 c2cwsgiutils/acceptance/connection.py,sha256=CDx6rYmHpUAhKMgeV94ZNONMj9BuaRglJhS0PvRlUc0,9053
 c2cwsgiutils/acceptance/print.py,sha256=0sO_QvdwzFrtOHXlq0BjGXM_0c-lUCcrCo-PU_oHH40,2328
 c2cwsgiutils/acceptance/utils.py,sha256=cmuV8Kig9KEvFZzQViYzwO-0NfsQU8cAaReL-higBDk,2077
 c2cwsgiutils/broadcast/__init__.py,sha256=cAODXqq2pwZp0n92QSi0ybJIQttV2CJwc1Cd1hhpEvQ,4160
 c2cwsgiutils/broadcast/interface.py,sha256=M2NMNCXky05xA_jVlnkEcRG-3SE0TEA2uXTz0oR4zKs,615
 c2cwsgiutils/broadcast/local.py,sha256=iJxv9IjzKjKYz6ZLXRSbrqGRmNUmGoYsSbcRSdz4dbs,1062
-c2cwsgiutils/broadcast/redis.py,sha256=TPEk8RyLI1uoqhu6VLEvVsoX-uaN7-D4MVp9Q7F3BfU,5089
+c2cwsgiutils/broadcast/redis.py,sha256=BW-4psoyPncNJfQgk81l1M0EFyiCqyHP8HbwWxNtyfo,5056
 c2cwsgiutils/broadcast/utils.py,sha256=0fQZXPu3p_5LEJpGenJwiiMxECQjJhjZBjIkBk8h-ng,272
 c2cwsgiutils/debug/__init__.py,sha256=80zdAZnE9cwgQW1odE2aOauIxYsG5CQpWvHPcslRue8,1239
 c2cwsgiutils/debug/_listeners.py,sha256=2YQvC5phYSwcIB44p5gJ_-CTBz0HoDivXvX7PVaOIFg,4358
 c2cwsgiutils/debug/_views.py,sha256=0SQ-fdq8VFxItKAtJ8y0OrdnxoEIeDC6dmnAhQ9Wjrk,7506
 c2cwsgiutils/debug/utils.py,sha256=1vtfXND_hzs6PH8ohnRGcPYaW2_qKRJ6VxDvEdG0hdU,2328
-c2cwsgiutils/request_tracking/__init__.py,sha256=Wde7KKgYzc0D0ESDD5LQYPtWzokA0yV7DjdtqMF1ktk,3853
+c2cwsgiutils/request_tracking/__init__.py,sha256=y5SKpcnpr3e7lRnY8hr6_XOarmn42t14B2J3ZZMIjh0,3820
 c2cwsgiutils/request_tracking/_sql.py,sha256=OQQhhkOK4lpYIeOwBocPu1a-IHGf8OTVeR8nYySJsCA,538
 c2cwsgiutils/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 c2cwsgiutils/scripts/check_es.py,sha256=dXF1FpyyIUMRlDxA-OY4RjOdnNqxYq2F6IhoNM7nRPg,4147
@@ -52,17 +52,17 @@ c2cwsgiutils/sql_profiler/_impl.py,sha256=ohH42gQ1VBeUj4ggff6vT3JwQohrDvSvqQLGCR
 c2cwsgiutils/sqlalchemylogger/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 c2cwsgiutils/sqlalchemylogger/_filters.py,sha256=OJQ9_WA-fd9fMZ7TUNFzHHTPI6msw2NVBl5RoeYFnGw,752
 c2cwsgiutils/sqlalchemylogger/_models.py,sha256=aHzaVA05kPNa2B_s5kLtEMCTLmr9TgH3Gv2PzVYGhxo,1422
-c2cwsgiutils/sqlalchemylogger/handlers.py,sha256=96b3Li6pRuNsajwZ1ezGQdf327WoUlA1OA6-zFHpIJM,4688
+c2cwsgiutils/sqlalchemylogger/handlers.py,sha256=UQ-vfUzMlzvtFoKxVWCkm1wdI_PcYqktGKksSpiXe2E,4686
 c2cwsgiutils/stats_pyramid/__init__.py,sha256=Vxncq4iRCIlrPjiugQVARqg3VjAMK5H3iMXpWO3NISo,971
 c2cwsgiutils/stats_pyramid/_db_spy.py,sha256=qTQ7xkvE6TN6mcOUhcPpOQBJla-yNY08lV05OZdjGkA,2841
 c2cwsgiutils/stats_pyramid/_pyramid_spy.py,sha256=tDm3Y-kRVp1Y_jEaz1bFlWHCeXkHMAogOKE6qN-rO08,2886
 c2cwsgiutils/stats_pyramid/_views.py,sha256=c3PfyrXzG6I184-bWUrHpR1bt3xyIMgs5mfcZ6NjEwU,527
-c2cwsgiutils-5.0.1.data/scripts/c2cwsgiutils-run,sha256=q738ALYHJIJq9wOhvIbZruZDegQcClfYm9GEq4y4qYU,579
+c2cwsgiutils-5.0.4.data/scripts/c2cwsgiutils-run,sha256=q738ALYHJIJq9wOhvIbZruZDegQcClfYm9GEq4y4qYU,579
 tests/acceptance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/acceptance/test_utils.py,sha256=_4GDX0Lx5bAUJq5WRm0aj-nTllIXDcmo3bqRrbAgs20,380
-c2cwsgiutils-5.0.1.dist-info/LICENSE.txt,sha256=PQNFSY2-jzHIwQ_UxvzxLVY5yLryW_lVLHVgUCvtKos,1668
-c2cwsgiutils-5.0.1.dist-info/METADATA,sha256=k7XtTsjCWX1-67Y0J7McMmq_dvb0yAf-p-BfsRWkIQw,31623
-c2cwsgiutils-5.0.1.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-c2cwsgiutils-5.0.1.dist-info/entry_points.txt,sha256=Be1vjq5sdITjO6XLdVDIwxii-UoYZcVlQoJ2la0yntk,1138
-c2cwsgiutils-5.0.1.dist-info/top_level.txt,sha256=U2UMa3vcTM_6GxZe2f8KeOi-8gIcUruUnmhVSZZ27BI,19
-c2cwsgiutils-5.0.1.dist-info/RECORD,,
+c2cwsgiutils-5.0.4.dist-info/LICENSE.txt,sha256=PQNFSY2-jzHIwQ_UxvzxLVY5yLryW_lVLHVgUCvtKos,1668
+c2cwsgiutils-5.0.4.dist-info/METADATA,sha256=jCbLiI1Mmm9_JFWZwxmYhqlyR6kuOh1nC-kv1KTBBE0,31908
+c2cwsgiutils-5.0.4.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+c2cwsgiutils-5.0.4.dist-info/entry_points.txt,sha256=Be1vjq5sdITjO6XLdVDIwxii-UoYZcVlQoJ2la0yntk,1138
+c2cwsgiutils-5.0.4.dist-info/top_level.txt,sha256=U2UMa3vcTM_6GxZe2f8KeOi-8gIcUruUnmhVSZZ27BI,19
+c2cwsgiutils-5.0.4.dist-info/RECORD,,

{c2cwsgiutils-5.0.1.dist-info → c2cwsgiutils-5.0.4.dist-info}/WHEEL

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