cherrypy-foundation 1.0.0__py3-none-any.whl → 1.0.0a2__py3-none-any.whl

cherrypy_foundation/tools/ratelimit.py

@@ -1,5 +1,5 @@
 # Ratelimit tools for cherrypy
-# Copyright (C) 2022-2026 IKUS Software
+# Copyright (C) 2022-2025 Patrik Dufresne
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,8 +22,6 @@ from collections import namedtuple
 
 import cherrypy
 
-from cherrypy_foundation.sessions import session_lock
-
 Tracker = namedtuple('Tracker', ['token', 'hits', 'timeout'])
 
 
@@ -150,27 +148,9 @@ class FileRateLimit(_DataStore):
 class Ratelimit(cherrypy.Tool):
     CONTEXT = 'TOOLS.RATELIMIT'
 
-    _datastores = {}
-
     def __init__(self, priority=60):
         super().__init__('before_handler', self.check_ratelimit, 'ratelimit', priority)
 
-    def _get_datastore(self, storage_class, **kwargs):
-        """
-        Create new datastore or return existing datastore.
-        """
-        # Default to RAM if storage class is not defined.
-        if storage_class is None:
-            kwargs = {}
-            storage_class = RamRateLimit
-        # Lookup for matching storage.
-        key = (storage_class, str(kwargs))
-        datastore = self._datastores.get(key)
-        if datastore is None:
-            # Create new storage if not found.
-            self._datastores[key] = datastore = storage_class(**kwargs)
-        return datastore
-
     def check_ratelimit(
         self,
         delay=3600,
@@ -181,8 +161,7 @@ class Ratelimit(cherrypy.Tool):
         methods=None,
         debug=False,
         hit=1,
-        storage_class=None,
-        **storage_kwargs,
+        **conf,
     ):
         """
         Verify the ratelimit. By default return a 429 HTTP error code (Too Many Request). After 25 request within the same hour.
@@ -195,8 +174,9 @@ class Ratelimit(cherrypy.Tool):
             scope:         if specify, define the scope of rate limit. Default to path_info.
             methods:       if specify, only the methods in the list will be rate limited.
         """
-        if delay <= 0:
-            raise ValueError('Invalid delay: %s' % delay)
+        assert delay > 0, 'invalid delay'
+
+        # Check if limit is enabled
         if limit <= 0:
             return
 
@@ -207,8 +187,13 @@ class Ratelimit(cherrypy.Tool):
                 cherrypy.log(f'skip rate limit for HTTP method {request.method}', context=self.CONTEXT)
             return
 
-        # Create storage using storage class
-        datastore = self._get_datastore(storage_class, **storage_kwargs)
+        # If datastore is not pass as configuration, create it for the first time.
+        datastore = getattr(self, '_ratelimit_datastore', None)
+        if datastore is None:
+            # Create storage using storage class
+            storage_class = conf.get('storage_class', RamRateLimit)
+            datastore = storage_class(**conf)
+            self._ratelimit_datastore = datastore
 
         # Identifier: prefer authenticated user; else client IP
         identifier = getattr(cherrypy.serving.request, 'login', None) or cherrypy.request.remote.ip
@@ -241,8 +226,7 @@ class Ratelimit(cherrypy.Tool):
             cherrypy.log(f'block access to path_info={request.path_info}', context=self.CONTEXT)
             if logout:
                 if hasattr(cherrypy.serving, 'session'):
-                    with session_lock() as session:
-                        session.clear()
+                    cherrypy.serving.session.clear()
                 raise cherrypy.HTTPRedirect("/")
             raise cherrypy.HTTPError(return_status)
 
@@ -256,10 +240,12 @@ class Ratelimit(cherrypy.Tool):
 
     def reset(self):
         """
-        Used to reset the ratelimit. (for unit test)
+        Used to reset the ratelimit.
         """
-        for datastore in self._datastores.values():
-            datastore.reset()
+        datastore = getattr(self, '_ratelimit_datastore', False)
+        if not datastore:
+            return
+        datastore.reset()
 
 
 cherrypy.tools.ratelimit = Ratelimit()

cherrypy_foundation/tools/secure_headers.py

@@ -1,5 +1,5 @@
 # Secure Headers tool for cherrypy
-# Copyright (C) 2012-2026 IKUS Software
+# Copyright (C) 2012-2025 IKUS Software
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

cherrypy_foundation/tools/sessions_timeout.py

@@ -1,5 +1,5 @@
 # Session timeout tool for cherrypy
-# Copyright (C) 2012-2026 IKUS Software
+# Copyright (C) 2012-2025 IKUS Software
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,8 +21,6 @@ import time
 import cherrypy
 from cherrypy.lib import httputil
 
-from cherrypy_foundation.sessions import session_lock
-
 SESSION_PERSISTENT = '_session_persistent'
 SESSION_START_TIME = '_session_start_time'
 
@@ -59,13 +57,13 @@ class SessionsTimeout(cherrypy.Tool):
         absolute_timeout = int(cfg.get('tools.sessions_timeout.absolute_timeout', SESSION_DEFAULT_ABSOLUTE_TIMEOUT))
         return idle_timeout, persistent_timeout, absolute_timeout
 
-    def _set_cookie_max_age(self, session, max_age: int) -> None:
+    def _set_cookie_max_age(self, max_age: int) -> None:
         """Adjust only Max-Age and Expires for the session cookie, keep other flags intact."""
         cookie_name = self._cookie_name()
         cookie = cherrypy.serving.response.cookie
         # Ensure the cookie key exists (CherryPy sets it when session id is issued/regenerated).
         if cookie_name not in cookie:
-            cookie[cookie_name] = session.id
+            cookie[cookie_name] = cherrypy.serving.session.id
         cookie[cookie_name]['max-age'] = str(max(0, max_age))
         cookie[cookie_name]['expires'] = httputil.HTTPDate(time.time() + max(0, max_age))
 
@@ -75,21 +73,24 @@ class SessionsTimeout(cherrypy.Tool):
             return 0
         return int(math.ceil(seconds / 60.0))
 
-    def _ensure_start_time(self, session) -> None:
+    def _ensure_start_time(self) -> None:
         """Ensure the session has a stable start time anchor for absolute timeout."""
+        session = cherrypy.serving.session
         if SESSION_START_TIME not in session or not isinstance(session.get(SESSION_START_TIME), datetime.datetime):
             session[SESSION_START_TIME] = session.now()
 
-    def _expire_and_restart(self, session, make_persistent: bool | None = None) -> None:
+    def _expire_and_restart(self, make_persistent: bool | None = None) -> None:
         """Expire current session and start a fresh one. Optionally set persistent flag."""
+        session = cherrypy.serving.session
         session.clear()
         session.regenerate()
         session[SESSION_START_TIME] = session.now()
         if make_persistent is not None:
             session[SESSION_PERSISTENT] = bool(make_persistent)
 
-    def _update_session_timeout(self, session) -> None:
-        self._ensure_start_time(session)
+    def _update_session_timeout(self) -> None:
+        session = cherrypy.serving.session
+        self._ensure_start_time()
 
         now: datetime.datetime = session.now()
         start: datetime.datetime = session[SESSION_START_TIME]
@@ -119,9 +120,9 @@ class SessionsTimeout(cherrypy.Tool):
             # Expired due to either sliding window or absolute cap
             # Start a fresh session; do NOT automatically re-mark persistent here.
             # Authentication/Remember me logic elsewhere can call set_persistent(True) again after login.
-            self._expire_and_restart(session)
+            self._expire_and_restart()
             # After regeneration, set a sensible session.timeout baseline:
-            session.timeout = idle_timeout_min
+            cherrypy.serving.session.timeout = idle_timeout_min
             return
 
         # Apply per-request remaining minutes to CherryPy's session timeout
@@ -129,7 +130,7 @@ class SessionsTimeout(cherrypy.Tool):
 
         if is_persistent:
             # Keep cookie lifetime aligned with remaining time so it can survive browser restarts.
-            self._set_cookie_max_age(session, remaining_sec)
+            self._set_cookie_max_age(remaining_sec)
         else:
             # For non-persistent, let CherryPy manage the session cookie (session or transient cookie).
             # If you want strict enforcement client-side too, uncomment the next line:
@@ -142,26 +143,23 @@ class SessionsTimeout(cherrypy.Tool):
             return
 
         # Ensure configured values are honored (method signature kept for CherryPy Tool interface)
-        with session_lock() as session:
-            self._update_session_timeout(session)
+        self._update_session_timeout()
 
     def set_persistent(self, value: bool = True) -> None:
         """Mark current session as persistent (or not) and reset the start window."""
-        with session_lock() as session:
-            session[SESSION_PERSISTENT] = bool(value)
-            # Reset absolute window anchor when the persistence policy changes
-            session[SESSION_START_TIME] = session.now()
-            self._update_session_timeout(session)
+        session = cherrypy.serving.session
+        session[SESSION_PERSISTENT] = bool(value)
+        # Reset absolute window anchor when the persistence policy changes
+        session[SESSION_START_TIME] = session.now()
+        self._update_session_timeout()
 
     def is_persistent(self) -> bool:
         """Return True if the session is marked persistent."""
-        with session_lock() as session:
-            return bool(session.get(SESSION_PERSISTENT, False))
+        return bool(cherrypy.serving.session.get(SESSION_PERSISTENT, False))
 
     def get_session_start_time(self) -> datetime.datetime | None:
         """Return the session start time if any."""
-        with session_lock() as session:
-            return session.get(SESSION_START_TIME, None)
+        return cherrypy.serving.session.get(SESSION_START_TIME, None)
 
 
 cherrypy.tools.sessions_timeout = SessionsTimeout()

cherrypy_foundation/tools/tests/locales/{de → en}/LC_MESSAGES/messages.po

@@ -5,11 +5,11 @@ msgstr ""
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
-"Language: de\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.6\n"
 
 msgid "Some text to translate"
-msgstr "Einige zu übersetzende Texte"
+msgstr ""

cherrypy_foundation/tools/tests/templates/test_jinja2.html

@@ -1,5 +1,4 @@
-<!DOCTYPE html>
-<html lang="en">
+<html>
     <head>
         <title>test-jinja2</title>
     </head>

cherrypy_foundation/tools/tests/templates/test_jinja2_i18n.html

@@ -0,0 +1,11 @@
+<html lang="{{ get_translation().locale }}">
+    <head>
+        <title>test-jinja2</title>
+    </head>
+    <body>
+        {{ get_language_name(get_translation().locale) }}<br/>
+        {% trans %}Some text to translate{% endtrans %}<br/>
+        {{ my_datetime | format_datetime(format='full') }}<br/>
+        {{ my_date | format_date(format='full') }}
+    </body>
+</html>

cherrypy_foundation/tools/tests/templates/test_jinjax.html

@@ -1,7 +1,6 @@
-<!DOCTYPE html>
-<html lang="en">
+<html>
     <head>
-        <title>test-jinjax</title>
+        <title>test-jinja2</title>
     </head>
     <body>
         <Button link="http://example.com" label="foo" />

cherrypy_foundation/tools/tests/test_auth.py

@@ -1,5 +1,5 @@
 # CherryPy
-# Copyright (C) 2026 IKUS Software
+# Copyright (C) 2025 IKUS Software
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,12 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import tempfile
+
 from collections import namedtuple
 from urllib.parse import urlencode
 
 import cherrypy
-from cherrypy.lib.sessions import FileSession
 from cherrypy.test import helper
 
 from .. import auth  # noqa
@@ -43,7 +42,7 @@ def user_from_key_func(userkey):
     return None
 
 
-@cherrypy.tools.sessions(locking='explicit', storage_class=FileSession)
+@cherrypy.tools.sessions()
 @cherrypy.tools.auth(
     user_lookup_func=user_lookup_func,
     user_from_key_func=user_from_key_func,
@@ -69,24 +68,8 @@ class Root:
 class AuthManagerTest(helper.CPWebCase):
     interactive = False
 
-    @classmethod
-    def setup_class(cls):
-        cls.tempdir = tempfile.TemporaryDirectory(prefix='cherrypy-foundation-', suffix='-session')
-        cls.session_dir = cls.tempdir.name
-        super().setup_class()
-
-    @classmethod
-    def teardown_class(cls):
-        cls.tempdir.cleanup()
-        super().teardown_class()
-
     @classmethod
     def setup_server(cls):
-        cherrypy.config.update(
-            {
-                'tools.sessions.storage_path': cls.session_dir,
-            }
-        )
         cherrypy.tree.mount(Root(), '/')
 
     def test_auth_redirect(self):

cherrypy_foundation/tools/tests/test_auth_mfa.py

@@ -1,5 +1,5 @@
 # CherryPy
-# Copyright (C) 2026 IKUS Software
+# Copyright (C) 2025 IKUS Software
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+
 import datetime
 from collections import namedtuple
 from urllib.parse import urlencode
@@ -22,8 +23,6 @@ import cherrypy
 from cherrypy.lib.sessions import RamSession
 from cherrypy.test import helper
 
-from cherrypy_foundation.sessions import session_lock
-
 from ..auth import AUTH_LAST_PASSWORD_AT
 from ..auth_mfa import (
     MFA_CODE_TIME,
@@ -65,7 +64,7 @@ def user_from_key_func(userkey):
     return None
 
 
-@cherrypy.tools.sessions(locking='explicit')
+@cherrypy.tools.sessions()
 @cherrypy.tools.auth(
     user_lookup_func=user_lookup_func,
     user_from_key_func=user_from_key_func,
@@ -104,8 +103,7 @@ class Root:
             code = cherrypy.tools.auth_mfa.generate_code()
             # Here the code should be send by email, SMS or any other means.
             # For our test we store it in the session.
-            with session_lock() as session:
-                session['code'] = code
+            cherrypy.serving.session['code'] = code
             html += "<p>new verification code sent to your email</p>\n"
         return html
 

cherrypy_foundation/tools/tests/test_i18n.py

@@ -1,5 +1,5 @@
 # CherryPy
-# Copyright (C) 2026 IKUS Software
+# Copyright (C) 2025 IKUS Software
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,6 +38,7 @@ class TestI18n(unittest.TestCase):
     def test_search_translation_en(self):
         # Load default translation return translation
         t = i18n._search_translation(self.mo_dir, 'messages', 'en')
+        self.assertIsInstance(t, gettext.GNUTranslations)
         self.assertEqual("en", t.locale.language)
         # Test translation object
         self.assertEqual(TEXT_EN, t.gettext(TEXT_EN))
@@ -53,8 +54,7 @@ class TestI18n(unittest.TestCase):
     def test_search_translation_invalid(self):
         # Load invalid translation return None
         t = i18n._search_translation(self.mo_dir, 'messages', 'tr')
-        # Return Null translations.
-        self.assertIn('NullTranslations', str(t.__class__))
+        self.assertIsNone(t)
 
 
 class Root:
@@ -76,7 +76,6 @@ class AbstractI18nTest(helper.CPWebCase):
                 'tools.i18n.default': cls.default_lang,
                 'tools.i18n.mo_dir': importlib.resources.files(__package__) / 'locales',
                 'tools.i18n.domain': 'messages',
-                'tools.i18n.cookie_name': 'locale',
             }
         )
         cherrypy.tree.mount(Root(), '/')
@@ -84,13 +83,6 @@ class AbstractI18nTest(helper.CPWebCase):
 
 class TestI18nWebCase(AbstractI18nTest):
 
-    def test_language_with_invalid(self):
-        #  Query the page without login-in
-        self.getPage("/", headers=[("Accept-Language", "invalid")])
-        self.assertStatus('200 OK')
-        self.assertHeaderItemValue("Content-Language", "en")
-        self.assertInBody(TEXT_EN)
-
     def test_language_with_unknown(self):
         #  Query the page without login-in
         self.getPage("/", headers=[("Accept-Language", "it")])
@@ -101,13 +93,13 @@ class TestI18nWebCase(AbstractI18nTest):
     def test_language_en(self):
         self.getPage("/", headers=[("Accept-Language", "en-US,en;q=0.8")])
         self.assertStatus('200 OK')
-        self.assertHeaderItemValue("Content-Language", "en-US")
+        self.assertHeaderItemValue("Content-Language", "en")
         self.assertInBody(TEXT_EN)
 
     def test_language_en_fr(self):
         self.getPage("/", headers=[("Accept-Language", "en-US,en;q=0.8,fr-CA;q=0.8")])
         self.assertStatus('200 OK')
-        self.assertHeaderItemValue("Content-Language", "en-US")
+        self.assertHeaderItemValue("Content-Language", "en")
         self.assertInBody(TEXT_EN)
 
     def test_language_fr(self):
@@ -115,22 +107,8 @@ class TestI18nWebCase(AbstractI18nTest):
         self.assertInBody(TEXT_EN)
         self.getPage("/", headers=[("Accept-Language", "fr-CA;q=0.8,fr;q=0.6")])
         self.assertStatus('200 OK')
-        self.assertHeaderItemValue("Content-Language", "fr-CA")
-        self.assertInBody(TEXT_FR)
-
-    def test_language_en_US_POSIX(self):
-        # When calling with locale variant
-        self.getPage("/", headers=[("Accept-Language", "en-US-POSIX")])
-        self.assertStatus('200 OK')
-        # Tehn page return en-US
-        self.assertHeaderItemValue("Content-Language", "en-US")
-
-    def test_cookie_fr(self):
-        # When calling with locale variant
-        self.getPage("/", headers=[("Accept-Language", "en-US"), ("Cookie", "locale=fr")])
-        self.assertStatus('200 OK')
-        # Tehn page return en-US
         self.assertHeaderItemValue("Content-Language", "fr")
+        self.assertInBody(TEXT_FR)
 
     def test_with_preferred_lang(self):
         # Given a default lang 'en'
@@ -147,59 +125,6 @@ class TestI18nWebCase(AbstractI18nTest):
         self.assertEqual(TEXT_EN, i18n.ugettext(TEXT_EN))
         self.assertIn('March', i18n.format_datetime(date, format='long'))
 
-    def test_format_datetime_locales(self):
-        date = datetime.fromtimestamp(1680111611, timezone.utc)
-        with i18n.preferred_timezone('utc'):
-            with i18n.preferred_lang('fr'):
-                self.assertEqual('29 mars 2023, 17:40:11 TU', i18n.format_datetime(date, format='long'))
-            with i18n.preferred_lang('en'):
-                self.assertEqual('March 29, 2023, 5:40:11\u202fPM UTC', i18n.format_datetime(date, format='long'))
-            with i18n.preferred_lang('en_US'):
-                self.assertEqual('March 29, 2023, 5:40:11\u202fPM UTC', i18n.format_datetime(date, format='long'))
-            with i18n.preferred_lang('en_GB'):
-                self.assertEqual('29 March 2023, 17:40:11 UTC', i18n.format_datetime(date, format='long'))
-            with i18n.preferred_lang('en_CH'):
-                self.assertEqual('29 March 2023, 17:40:11 UTC', i18n.format_datetime(date, format='long'))
-            with i18n.preferred_lang('de'):
-                self.assertEqual('29. März 2023, 17:40:11 UTC', i18n.format_datetime(date, format='long'))
-            with i18n.preferred_lang('de_CH'):
-                self.assertEqual('29. März 2023, 17:40:11 UTC', i18n.format_datetime(date, format='long'))
-
-        with i18n.preferred_timezone('Europe/Paris'):
-            with i18n.preferred_lang('fr'):
-                self.assertEqual('29 mars 2023, 19:40:11 +0200', i18n.format_datetime(date, format='long'))
-            with i18n.preferred_lang('fr_CH'):
-                self.assertEqual('29 mars 2023, 19:40:11 +0200', i18n.format_datetime(date, format='long'))
-            with i18n.preferred_lang('en'):
-                self.assertEqual('March 29, 2023, 7:40:11\u202fPM +0200', i18n.format_datetime(date, format='long'))
-            with i18n.preferred_lang('en_US'):
-                self.assertEqual('March 29, 2023, 7:40:11\u202fPM +0200', i18n.format_datetime(date, format='long'))
-            with i18n.preferred_lang('en_GB'):
-                self.assertEqual('29 March 2023, 19:40:11 CEST', i18n.format_datetime(date, format='long'))
-            with i18n.preferred_lang('en_CH'):
-                self.assertEqual('29 March 2023, 19:40:11 CEST', i18n.format_datetime(date, format='long'))
-            with i18n.preferred_lang('de'):
-                self.assertEqual('29. März 2023, 19:40:11 MESZ', i18n.format_datetime(date, format='long'))
-            with i18n.preferred_lang('de_CH'):
-                self.assertEqual('29. März 2023, 19:40:11 MESZ', i18n.format_datetime(date, format='long'))
-
-    def test_list_available_locales(self):
-        self.assertEqual(['de', 'en', 'fr'], sorted([str(l) for l in i18n.list_available_locales()]))
-
-    def test_list_available_timezones(self):
-        timezones = i18n.list_available_timezones()
-        self.assertIn('America/Toronto', timezones)
-
-    def test_get_timezone_name(self):
-        with i18n.preferred_lang('en'):
-            self.assertEqual('Eastern Time', i18n.get_timezone_name('America/Toronto'))
-            self.assertEqual('ET', i18n.get_timezone_name('America/Toronto', width='short'))
-            self.assertEqual('Eastern Time', i18n.get_timezone_name('America/Toronto', width='long'))
-        with i18n.preferred_lang('fr'):
-            self.assertEqual('heure de l’Est nord-américain', i18n.get_timezone_name('America/Toronto'))
-            self.assertEqual('HE', i18n.get_timezone_name('America/Toronto', width='short'))
-            self.assertEqual('heure de l’Est nord-américain', i18n.get_timezone_name('America/Toronto', width='long'))
-
 
 class TestI18nDefaultLangWebCase(AbstractI18nTest):
     default_lang = 'FR'

cherrypy_foundation/tools/tests/test_jinja2.py

@@ -1,5 +1,5 @@
-# Cherrypy-foundation
-# Copyright (C) 2026 IKUS Software
+# CherryPy Foundation
+# Copyright (C) 2025 IKUS Software
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,10 +21,6 @@ import cherrypy
 from cherrypy.test import helper
 from parameterized import parameterized
 
-from cherrypy_foundation.components import StaticMiddleware
-from cherrypy_foundation.tests import SeleniumUnitTest
-from cherrypy_foundation.url import url_for
-
 from .. import i18n  # noqa
 from .. import jinja2  # noqa
 
@@ -42,18 +38,9 @@ def extra_processor():
     return {'var2': 'bar'}
 
 
-@cherrypy.tools.i18n(on=False)
-@cherrypy.tools.sessions(on=False)
-class Static:
-
-    components = StaticMiddleware()
-
-
-@cherrypy.tools.jinja2(on=False, env=env, extra_processor=extra_processor)
+@cherrypy.tools.jinja2(env=env, extra_processor=extra_processor)
 class Root:
 
-    static = Static()
-
     @cherrypy.expose
     @cherrypy.tools.jinja2(template='test_jinja2.html')
     def index(self):
@@ -65,13 +52,12 @@ class Root:
         return {'var1': 'test-jinjax'}
 
     @cherrypy.expose
-    @cherrypy.tools.jinja2(template='test_jinjax_i18n.html')
+    @cherrypy.tools.jinja2(template='test_jinja2_i18n.html')
     @cherrypy.tools.i18n(
         default='fr',
         default_timezone='America/Toronto',
         mo_dir=importlib.resources.files(__package__) / 'locales',
         domain='messages',
-        cookie_name='locale',  # For LocaleSelection
     )
     def localized(self):
         return {
@@ -80,7 +66,7 @@ class Root:
         }
 
 
-class Jinja2Test(helper.CPWebCase, SeleniumUnitTest):
+class Jinja2Test(helper.CPWebCase):
     default_lang = None
     interactive = False
 
@@ -109,7 +95,6 @@ class Jinja2Test(helper.CPWebCase, SeleniumUnitTest):
         # Then the page is render dynamically using page context
         self.assertInBody('<a class="btn btn-primary" href="http://example.com">foo</a>')
 
-    @skipUnless(HAS_JINJAX, reason='Required jinjax')
     @parameterized.expand(
         [
             ('server_default', {}, 'fr'),
@@ -136,18 +121,3 @@ class Jinja2Test(helper.CPWebCase, SeleniumUnitTest):
             self.assertInBody('Some text to translate')
             self.assertInBody('Wednesday, November 26, 2025, 6:16:00\u202fAM Eastern Standard Time')
             self.assertInBody('Monday, December 22, 2025')
-
-    @skipUnless(HAS_JINJAX, reason='Required jinjax')
-    def test_get_page_i18n_selenium(self):
-        # Given a localized page render with jinja2
-        with self.selenium() as driver:
-            # When querying the page
-            driver.get(url_for('localized'))
-            # Then page load without error in english (enforced chronium lang)
-            self.assertFalse(driver.get_log('browser'))
-            self.assertEqual('en_US', driver.find_element('css selector', 'html').get_attribute('lang'))
-            # When user select a language
-            btn = driver.find_element('css selector', 'button[data-locale=fr]')
-            btn.click()
-            # Then page is reloaded with in French.
-            self.assertEqual('fr', driver.find_element('css selector', 'html').get_attribute('lang'))

cherrypy_foundation/tools/tests/test_ratelimit.py

@@ -1,5 +1,5 @@
 # CherryPy
-# Copyright (C) 2026 IKUS Software
+# Copyright (C) 2025 IKUS Software
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@ class RateLimitTest(helper.CPWebCase):
 
     @classmethod
     def setup_server(cls):
-        rate_limit_storage_class = None
+        rate_limit_storage_class = ratelimit.RamRateLimit
         if cls.rate_limit_dir:
             rate_limit_storage_class = ratelimit.FileRateLimit
         cherrypy.config.update(