cherrypy-foundation 1.0.0a11__py3-none-any.whl → 1.0.0a13__py3-none-any.whl

cherrypy_foundation/plugins/ldap.py

@@ -63,7 +63,7 @@ def first_attribute(attributes, keys, default=None):
             value = attributes[attr]
             if isinstance(value, list):
                 if len(value) == 0:
-                    pass
+                    continue
                 return value[0]
             else:
                 return value

cherrypy_foundation/plugins/tests/test_ldap.py

@@ -19,13 +19,13 @@ Created on Oct 17, 2015
 @author: Patrik Dufresne <patrik@ikus-soft.com>
 """
 import os
-from unittest import mock, skipUnless
+from unittest import TestCase, mock, skipUnless
 
 import cherrypy
 import ldap3
 from cherrypy.test import helper
 
-from .. import ldap  # noqa
+from ..ldap import all_attribute, first_attribute  # noqa
 
 original_connection = ldap3.Connection
 
@@ -35,6 +35,79 @@ def mock_ldap_connection(*args, **kwargs):
     return original_connection(*args, client_strategy=ldap3.MOCK_ASYNC, **kwargs)
 
 
+class LdapFirstAttributeTest(TestCase):
+
+    def test_no_keys_returns_default(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertIsNone(first_attribute(attributes, None))
+        self.assertEqual(first_attribute(attributes, [], default="fallback"), "fallback")
+
+    def test_single_key_with_scalar_value(self):
+        attributes = {"uid": "jdoe"}
+        self.assertEqual(first_attribute(attributes, "uid"), "jdoe")
+
+    def test_single_key_with_list_value(self):
+        attributes = {"mail": ["john@example.com", "alt@example.com"]}
+        self.assertEqual(first_attribute(attributes, "mail"), "john@example.com")
+
+    def test_empty_list_value_is_skipped(self):
+        attributes = {
+            "mail": [],
+            "uid": ["jdoe"],
+        }
+        self.assertEqual(first_attribute(attributes, ["mail", "uid"]), "jdoe")
+
+    def test_missing_first_key_uses_next_key(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertEqual(first_attribute(attributes, ["sn", "cn"]), "John Doe")
+
+    def test_all_keys_missing_returns_default(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertEqual(first_attribute(attributes, ["sn", "uid"], default="unknown"), "unknown")
+
+    def test_key_not_found_without_default_returns_none(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertIsNone(first_attribute(attributes, "uid"))
+
+
+class LdapAllAttributeTest(TestCase):
+
+    def test_no_keys_returns_default(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertIsNone(all_attribute(attributes, None))
+        self.assertEqual(all_attribute(attributes, [], default="fallback"), "fallback")
+
+    def test_single_key_with_scalar_value(self):
+        attributes = {"uid": "jdoe"}
+        self.assertEqual(all_attribute(attributes, "uid"), ["jdoe"])
+
+    def test_single_key_with_list_value(self):
+        attributes = {"mail": ["john@example.com", "alt@example.com"]}
+        self.assertEqual(all_attribute(attributes, "mail"), ["john@example.com"])
+
+    def test_multiple_keys_collect_values(self):
+        attributes = {
+            "uid": "jdoe",
+            "cn": ["John Doe"],
+        }
+        self.assertEqual(all_attribute(attributes, ["uid", "cn"]), ["jdoe", "John Doe"])
+
+    def test_missing_keys_are_skipped(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertEqual(all_attribute(attributes, ["sn", "cn", "uid"]), ["John Doe"])
+
+    def test_all_keys_missing_returns_default(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertEqual(all_attribute(attributes, ["sn", "uid"], default=[]), [])
+
+    def test_empty_list_value_is_appended_as_empty_list(self):
+        attributes = {
+            "mail": [],
+            "uid": "jdoe",
+        }
+        self.assertEqual(all_attribute(attributes, ["mail", "uid"]), [[], "jdoe"])
+
+
 class LdapPluginTest(helper.CPWebCase):
 
     @classmethod

cherrypy_foundation/tools/i18n.py

@@ -14,95 +14,107 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-"""Internationalization and Localization for CherryPy
+"""
+Internationalization (i18n) and Localization (l10n) support for CherryPy.
+
+This module provides a CherryPy tool that integrates GNU gettext and Babel
+to handle language selection, translations, locale-aware formatting, and
+timezone handling on a per-request basis.
+
+The active language is resolved in the following order (highest priority first):
 
-This tool provides locales and loads translations in the following order:
+1. Language explicitly set with ``with i18n.preferred_lang():``
+2. User-defined callback (``tools.i18n.func``)
+3. HTTP ``Accept-Language`` request header
+4. Default language configured via ``tools.i18n.default``
 
-1. `with i18n.preferred_lang()`
-2. `tools.i18n.func` callback function (optional)
-3. HTTP Accept-Language headers
-4. `tools.i18n.default` value
+Translations are loaded using Babel and gettext, and the resolved locale is
+available through ``i18n.get_translation()`` during request handling.
 
-The tool uses `babel` <http://babel.edgewall.org> for localization and
-handling translations. Within your Python code you can use four functions
-defined in this module and the loaded locale provided as `i18n.get_translation()`
+---------------------------------------------------------------------------
+Basic usage
+---------------------------------------------------------------------------
 
-Example::
+Within Python code, mark translatable strings using ``ugettext`` or
+``ungettext``:
 
-    from i18n import ugettext as _, ungettext
+    from i18n import gettext as _, ngettext
 
-    class MyController(object):
+    class MyController:
         @cherrypy.expose
         def index(self):
             locale = cherrypy.response.i18n.locale
-            s1 = _(u'Translateable string')
-            s2 = ungettext(u'There is one string.',
-                           u'There are more strings.', 2)
-            return u'<br />'.join([s1, s2, locale.display_name])
+            s1 = _(u"Translatable string")
+            s2 = ngettext(
+                u"There is one item.",
+                u"There are multiple items.",
+                2
+            )
+            return "<br />".join([s1, s2, locale.display_name])
 
-If you have code (e.g. database models) that is executed before the response
-object is available, use the *_lazy functions to mark the strings
-translateable. They will be translated later on, when the text is used (and
-hopefully the response object is available then).
+---------------------------------------------------------------------------
+Lazy translations
+---------------------------------------------------------------------------
 
-Example::
+If code is executed before a CherryPy response object is available
+(e.g. model definitions or module-level constants), use the ``*_lazy``
+helpers. These defer translation until the value is actually rendered:
 
-    from i18n_tool import ugettext_lazy
+    from i18n_tool import gettext_lazy
 
     class Model:
-        def __init__(self):
-            name = ugettext_lazy(u'Name of the model')
+        name = gettext_lazy(u"Model name")
 
-For your templates read the documentation of your template engine how to
-integrate babel with it. I think `Genshi<http://genshi.edgewall.org>`_ and
-`Jinja 2<http://jinja.pocoo.org`_ support it out of the box.
+---------------------------------------------------------------------------
+Templates
+---------------------------------------------------------------------------
 
+For template rendering, i18n integrate with jinja2.
 
-Settings for the CherryPy configuration::
-
-    [/]
-    tools.i18n.on = True
-    tools.i18n.default = Your language with territory (e.g. 'en_US')
-    tools.i18n.mo_dir = Directory holding the locale directories
-    tools.i18n.domain = Your gettext domain (e.g. application name)
+    {% trans %}Text to translate{% endtrans %}
+    {{ _('Text to translate') }}
+    {{ get_translation().gettext('Text to translate') }}
+    {{ get_translation().locale }}
+    {{ var | format_datetime(format='full') }}
+    {{ var | format_date(format='full') }}
 
-The mo_dir must contain subdirectories named with the language prefix
-for all translations, containing a LC_MESSAGES dir with the compiled
-catalog file in it.
+---------------------------------------------------------------------------
+Configuration
+---------------------------------------------------------------------------
 
-Example::
+Example CherryPy configuration:
 
     [/]
     tools.i18n.on = True
-    tools.i18n.default = 'en_US'
-    tools.i18n.mo_dir = '/home/user/web/myapp/i18n'
-    tools.i18n.domain = 'myapp'
+    tools.i18n.default = "en_US"
+    tools.i18n.mo_dir = "/path/to/i18n"
+    tools.i18n.domain = "myapp"
 
-    Now the tool will look for a file called myapp.mo in
-    /home/user/web/myapp/i18n/en/LC_MESSACES/
-    or generic: <mo_dir>/<language>/LC_MESSAGES/<domain>.mo
+The ``mo_dir`` directory must contain subdirectories named after language
+codes (e.g. ``en``, ``fr_CA``), each containing an ``LC_MESSAGES`` directory
+with the compiled ``.mo`` file:
 
-That's it.
+    <mo_dir>/<language>/LC_MESSAGES/<domain>.mo
 
-:License: BSD
-:Author: Thorsten Weimann <thorsten.weimann (at) gmx (dot) net>
-:Date: 2010-02-08
 """
 
-
+import logging
 import os
-import threading
 from contextlib import contextmanager
+from contextvars import ContextVar
 from functools import lru_cache
+from gettext import NullTranslations, translation
 
 import cherrypy
 import pytz
 from babel import dates
 from babel.core import Locale, get_global
-from babel.support import LazyProxy, NullTranslations, Translations
+from babel.support import LazyProxy, Translations
 
-# Store current translation and preferred_lang
-_current = threading.local()
+_preferred_lang = ContextVar('preferred_lang', default=())
+_preferred_timezone = ContextVar('preferred_timezone', default=())
+_translation = ContextVar('translation', default=None)
+_tzinfo = ContextVar('tzinfo', default=None)
 
 
 def _get_config(key, default=None):
@@ -122,21 +134,20 @@ def preferred_lang(lang):
     with i18n.preferred_lang('fr'):
         i18n.gettext('some string')
     """
-    assert lang is None or isinstance(lang, str)
-    prev_lang = getattr(_current, 'preferred_lang', [])
-    prev_trans = getattr(_current, 'translation', None)
+    if not (lang is None or isinstance(lang, str)):
+        raise ValueError(lang)
     try:
-        # Update prefered lang and clear translation.
+        # Update preferred lang and clear translation.
         if lang:
-            _current.preferred_lang = [lang]
-        elif hasattr(_current, 'preferred_lang'):
-            del _current.preferred_lang
-        _current.translation = None
+            token_l = _preferred_lang.set((lang,))
+        else:
+            token_l = _preferred_lang.set(tuple())
+        token_t = _translation.set(None)
         yield
     finally:
         # Restore previous value
-        _current.preferred_lang = prev_lang
-        _current.translation = prev_trans
+        _preferred_lang.reset(token_l)
+        _translation.reset(token_t)
 
 
 @contextmanager
@@ -147,22 +158,24 @@ def preferred_timezone(timezone):
     with i18n.preferred_lang('America/Montreal'):
         i18n.format_datetime(...)
     """
-    assert timezone is None or isinstance(timezone, str)
-    prev_timezone = getattr(_current, 'preferred_timezone', [])
-    prev_tzinfo = getattr(_current, 'tzinfo', None)
+    if not (timezone is None or isinstance(timezone, str)):
+        raise ValueError(timezone)
     try:
-        # Update prefered lang and clear translation.
-        _current.preferred_timezone = [timezone] + prev_timezone
-        _current.tzinfo = None
+        # Update preferred timezone and clear tzinfo.
+        if timezone:
+            token_t = _preferred_timezone.set((timezone,))
+        else:
+            token_t = _preferred_timezone.set(tuple())
+        token_z = _tzinfo.set(None)
         yield
     finally:
         # Restore previous value
-        _current.preferred_timezone = prev_timezone
-        _current.tzinfo = prev_tzinfo
+        _preferred_timezone.reset(token_t)
+        _tzinfo.reset(token_z)
 
 
-@lru_cache(maxsize=10)
-def _search_translation(dirname, domain, *locales):
+@lru_cache(maxsize=32)
+def _search_translation(dirname, domain, *locales, sourcecode_lang='en'):
     """
     Loads the first existing translations for known locale.
 
@@ -170,29 +183,37 @@ def _search_translation(dirname, domain, *locales):
         langs : List
             List of languages as returned by `parse_accept_language_header`.
         dirname : String
-            Directory of the translations (`tools.I18nTool.mo_dir`).
-            Might be a list of directories.
+            A single directory of the translations (`tools.i18n.mo_dir`).
         domain : String
-            Gettext domain of the catalog (`tools.I18nTool.domain`).
+            Gettext domain of the catalog (`tools.i18n.domain`).
 
     :returns: Translations, the corresponding Locale object.
     """
     if not isinstance(locales, (list, tuple)):
-        locales = [locales]
-    t = Translations.load(dirname, locales, domain)
-    # Ignore null translation
-    if t.__class__ is NullTranslations:
-        return None
-    # Assign prefered local to this translation to know the current locale.
-    trans_locale = Locale.parse(t.files[0].split('/')[-3])
+        locales = tuple(locales)
+
+    # Loop on each locales to find the best matching translation.
     for locale in locales:
         try:
-            locale = Locale.parse(locale)
-            if trans_locale == locale or trans_locale.language == locale.language:
-                t.locale = locale
-                break
-        except ValueError:
-            continue  # Invalid locale identifier
+            # Use `gettext.translation()` instead of `gettext.find()` to chain translation fr_CA -> fr -> src.
+            t = translation(domain=domain, localedir=dirname, languages=[locale], fallback=True, class_=Translations)
+        except Exception:
+            # If exception occur while loading the translation file. The file is probably corrupted.
+            cherrypy.log(
+                f'failed to load gettext catalog domain={domain} localedir={dirname} locale={locale}',
+                context='I18N',
+                severity=logging.WARNING,
+                traceback=True,
+            )
+            continue
+        if t.__class__ is NullTranslations and not locale.startswith(sourcecode_lang):
+            # Continue searching if translation is not found.
+            continue
+        t.locale = Locale.parse(locale)
+        return t
+    # If translation file not found, return default
+    t = NullTranslations()
+    t.locale = Locale(sourcecode_lang)
     return t
 
 
@@ -200,23 +221,37 @@ def get_language_name(lang_code):
     """
     Translate the language code into it's language display name.
     """
-    locale = Locale.parse(lang_code)
-    trans = get_translation()
-    return locale.get_language_name(trans.locale)
+    try:
+        locale = Locale.parse(lang_code)
+    except Exception:
+        return lang_code
+    translation = get_translation()
+    return locale.get_language_name(translation.locale)
 
 
 def get_timezone():
     """
     Get the best timezone information for the current context.
+
+    The timezone returned is determined with the following priorities:
+
+    * value of preferred_timezone()
+    * tools.i18n.default_timezone
+    * default server time.
+
     """
     # When tzinfo is defined, use it
-    tzinfo = getattr(_current, 'tzinfo', None)
+    tzinfo = _tzinfo.get()
     if tzinfo is not None:
         return tzinfo
     # Otherwise search for a valid timezone.
-    tzinfo = None
-    default_timezone = _get_config('tools.i18n.default_timezone')
-    preferred_timezone = getattr(_current, 'preferred_timezone', [default_timezone])
+    default = _get_config('tools.i18n.default_timezone')
+    preferred_timezone = _preferred_timezone.get()
+    if default and default not in preferred_timezone:
+        preferred_timezone = (
+            *preferred_timezone,
+            default,
+        )
     for timezone in preferred_timezone:
         try:
             tzinfo = dates.get_timezone(timezone)
@@ -226,8 +261,8 @@ def get_timezone():
     # If we can't find a valid timezone using the default and preferred value, fall back to server timezone.
     if tzinfo is None:
         tzinfo = dates.get_timezone(None)
-    _current.tzinfo = tzinfo
-    return _current.tzinfo
+    _tzinfo.set(tzinfo)
+    return tzinfo
 
 
 def get_translation():
@@ -235,37 +270,42 @@ def get_translation():
     Get the best translation for the current context.
     """
     # When translation is defined, use it
-    translation = getattr(_current, 'translation', None)
+    translation = _translation.get()
     if translation is not None:
         return translation
 
     # Otherwise, we need to search the translation.
     # `preferred_lang` should always has a sane value within a cherrypy request because of hooks
     # But we also need to support calls outside cherrypy.
+    sourcecode_lang = _get_config('tools.i18n.sourcecode_lang', 'en')
     default = _get_config('tools.i18n.default')
-    preferred_lang = getattr(_current, 'preferred_lang', [default])
+    preferred_lang = _preferred_lang.get()
+    if default and default not in preferred_lang:
+        preferred_lang = (
+            *preferred_lang,
+            default,
+        )
     mo_dir = _get_config('tools.i18n.mo_dir')
-    domain = _get_config('tools.i18n.domain')
-    trans = _search_translation(mo_dir, domain, *preferred_lang)
-    if trans is None:
-        trans = NullTranslations()
-        trans.locale = Locale('en')
-    _current.translation = trans
-    return _current.translation
+    domain = _get_config('tools.i18n.domain', 'messages')
+    translation = _search_translation(mo_dir, domain, *preferred_lang, sourcecode_lang=sourcecode_lang)
+    _translation.set(translation)
+    return translation
 
 
 def list_available_locales():
     """
     Return a list of available translations.
     """
-    mo_dir = _get_config('tools.i18n.mo_dir', False)
-    domain = _get_config('tools.i18n.domain')
+    mo_dir = _get_config('tools.i18n.mo_dir')
+    domain = _get_config('tools.i18n.domain', 'messages')
     if not mo_dir:
         return
     for lang in os.listdir(mo_dir):
-        trans = _search_translation(mo_dir, domain, lang)
-        if trans is not None:
-            yield trans.locale
+        if os.path.exists(os.path.join(mo_dir, lang, 'LC_MESSAGES', f'{domain}.mo')):
+            try:
+                yield Locale.parse(lang)
+            except Exception:
+                continue
 
 
 def list_available_timezones():
@@ -278,7 +318,7 @@ def list_available_timezones():
 
 
 # Public translation functions
-def ugettext(message):
+def gettext(message):
     """Standard translation function. You can use it in all your exposed
     methods and everywhere where the response object is available.
 
@@ -289,13 +329,13 @@ def ugettext(message):
     :returns: The translated message.
     :rtype: Unicode
     """
-    return get_translation().ugettext(message)
+    return get_translation().gettext(message)
 
 
-gettext = ugettext
+ugettext = gettext
 
 
-def ungettext(singular, plural, num):
+def ngettext(singular, plural, num):
     """Like ugettext, but considers plural forms.
 
     :parameters:
@@ -310,34 +350,29 @@ def ungettext(singular, plural, num):
     :returns: The translated message as singular or plural.
     :rtype: Unicode
     """
-    return get_translation().ungettext(singular, plural, num)
+    return get_translation().ngettext(singular, plural, num)
 
 
-ngettext = ungettext
+ungettext = ngettext
 
 
 def gettext_lazy(message):
-    """Like ugettext, but lazy.
+    """Like gettext, but lazy.
 
     :returns: A proxy for the translation object.
     :rtype: LazyProxy
     """
 
     def func():
-        return get_translation().ugettext(message)
+        return get_translation().gettext(message)
 
     return LazyProxy(func, enable_cache=False)
 
 
 def format_datetime(datetime=None, format='medium', tzinfo=None):
     """
-    Wraper arround babel format_datetime to provide a default locale.
-    The timezone used to format the date is determine with the following priorities:
-    * value of tzinfo
-    * value of get_timezone()
-    * default server time.
+    Wrapper around babel format_datetime to use current locale and current timezone.
     """
-    # When formating date or english, let use en_GB as it's to most complete translation.
     return dates.format_datetime(
         datetime=datetime,
         format=format,
@@ -348,14 +383,19 @@ def format_datetime(datetime=None, format='medium', tzinfo=None):
 
 def format_date(datetime=None, format='medium', tzinfo=None):
     """
-    Wraper arround babel format_date to provide a default locale.
+    Wrapper around babel format_date to provide a default locale.
     """
-    return format_datetime(datetime=datetime, format=dates.get_date_format(format), tzinfo=tzinfo)
+    # To enforce the timezone and locale, make use of format_datetime for dates.
+    return dates.format_datetime(
+        datetime=datetime,
+        format=dates.get_date_format(format),
+        locale=get_translation().locale,
+        tzinfo=tzinfo or get_timezone(),
+    )
 
 
-def get_timezone_name(tzinfo):
-    locale = Locale(get_translation().locale.language)
-    return dates.get_timezone_name(tzinfo, width='long', locale=locale)
+def get_timezone_name(tzinfo, width='long'):
+    return dates.get_timezone_name(tzinfo, width=width, locale=get_translation().locale)
 
 
 def _load_default(mo_dir, domain, default, **kwargs):
@@ -363,33 +403,31 @@ def _load_default(mo_dir, domain, default, **kwargs):
     Initialize the language using the default value from the configuration.
     """
     # Clear current translation
-    _current.preferred_lang = [default]
-    _current.preferred_timezone = [kwargs['default_timezone']] if 'default_timezone' in kwargs else []
+    _preferred_lang.set(tuple())
+    _preferred_timezone.set(tuple())
     cherrypy.request._i18n_lang_func = kwargs.get('lang', kwargs.get('func', False))
     cherrypy.request._i18n_tzinfo_func = kwargs.get('tzinfo', False)
     # Clear current translation
-    _current.translation = None
+    _translation.set(None)
     # Clear current timezone
-    _current.tzinfo = None
+    _tzinfo.set(None)
 
 
 def _load_accept_language(**kwargs):
     """
-    When running within a request, load the prefered language from Accept-Language
+    When running within a request, load the preferred language from Accept-Language header.
     """
-
     if cherrypy.request.headers.elements('Accept-Language'):
-        count = 0
-        for x in cherrypy.request.headers.elements('Accept-Language'):
-            _current.preferred_lang.insert(count, x.value.replace('-', '_'))
-            count += 1
-    # Clear current translation
-    _current.translation = None
+        # Sort language by quality
+        languages = sorted(cherrypy.request.headers.elements('Accept-Language'), key=lambda x: x.qvalue, reverse=True)
+        _preferred_lang.set(tuple(lang.value.replace('-', '_') for lang in languages))
+        # Clear current translation
+        _translation.set(None)
 
 
 def _load_func_language(**kwargs):
     """
-    When running a request where a current user is found, load prefered language from user preferences.
+    When running a request where a current user is found, load preferred language from user preferences.
     """
     func = getattr(cherrypy.request, '_i18n_lang_func', False)
     if not func:
@@ -401,14 +439,14 @@ def _load_func_language(**kwargs):
     if not lang:
         return
     # Add custom lang to preferred_lang
-    _current.preferred_lang.insert(0, lang)
+    _preferred_lang.set((lang,))
     # Clear current translation
-    _current.translation = None
+    _translation.set(None)
 
 
 def _load_func_tzinfo(**kwargs):
     """
-    When running a request, load the prefered timezone information from user preferences.
+    When running a request, load the preferred timezone information from user preferences.
     """
     func = getattr(cherrypy.request, '_i18n_tzinfo_func', False)
     if not func:
@@ -420,9 +458,9 @@ def _load_func_tzinfo(**kwargs):
     if not tzinfo:
         return
     # Add custom lang to preferred_lang
-    _current.preferred_timezone.insert(0, tzinfo)
+    _preferred_timezone.set((tzinfo,))
     # Clear current translation
-    _current.tzinfo = None
+    _tzinfo.set(None)
 
 
 def _set_content_language(**kwargs):
@@ -431,9 +469,12 @@ def _set_content_language(**kwargs):
     language of `cherrypy.response.i18n.locale`.
     """
     if 'Content-Language' not in cherrypy.response.headers:
-        locale = get_translation().locale
-        language_tag = f"{locale.language}-{locale.territory}" if locale.territory else locale.language
-        cherrypy.response.headers['Content-Language'] = language_tag
+        # Only define the content language if the handler uses i18n module.
+        translation = _translation.get()
+        if translation:
+            locale = translation.locale
+            language_tag = f"{locale.language}-{locale.territory}" if locale.territory else locale.language
+            cherrypy.response.headers['Content-Language'] = language_tag
 
 
 class I18nTool(cherrypy.Tool):

cherrypy_foundation/tools/tests/test_i18n.py

@@ -38,7 +38,6 @@ 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))
@@ -54,7 +53,8 @@ class TestI18n(unittest.TestCase):
     def test_search_translation_invalid(self):
         # Load invalid translation return None
         t = i18n._search_translation(self.mo_dir, 'messages', 'tr')
-        self.assertIsNone(t)
+        # Return Null translations.
+        self.assertIn('NullTranslations', str(t.__class__))
 
 
 class Root:
@@ -117,6 +117,13 @@ class TestI18nWebCase(AbstractI18nTest):
         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_with_preferred_lang(self):
         # Given a default lang 'en'
         date = datetime.fromtimestamp(1680111611, timezone.utc)

{cherrypy_foundation-1.0.0a11.dist-info → cherrypy_foundation-1.0.0a13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cherrypy-foundation
-Version: 1.0.0a11
+Version: 1.0.0a13
 Summary: CherryPy Foundation
 Author-email: Patrik Dufresne <patrik@ikus-soft.com>
 License: GPLv3

{cherrypy_foundation-1.0.0a11.dist-info → cherrypy_foundation-1.0.0a13.dist-info}/RECORD

@@ -81,13 +81,13 @@ cherrypy_foundation/components/vendor/typeahead/jquery.typeahead.min.css,sha256=
 cherrypy_foundation/components/vendor/typeahead/jquery.typeahead.min.js,sha256=eFBtgouYdW587kYINWsjkN-UR8GVWAG_fQe1fpJfjOw,47828
 cherrypy_foundation/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cherrypy_foundation/plugins/db.py,sha256=46S-2kR9BHVYRN9cxWwYfzY2WkpEVBCpx1ubsJolYfA,10108
-cherrypy_foundation/plugins/ldap.py,sha256=hehNXGYWLSh_tqqbI_sZdFGjC9uJAyeZ-vMNPai9s_w,9909
+cherrypy_foundation/plugins/ldap.py,sha256=PxZp-2tHy73CegiIV5pKnfWe0WOCqNRIYQR8aIh1UEs,9913
 cherrypy_foundation/plugins/restapi.py,sha256=S5GIxHL0M3Wcs33fyVOb0RfX1FXbp2fqUxJ_ufqBrD4,2843
 cherrypy_foundation/plugins/scheduler.py,sha256=McTR72GGTuW7UZKco_Czmp09PfqJ-aHXJxh7h9BFZvA,10777
 cherrypy_foundation/plugins/smtp.py,sha256=yTCUj2XzrJEJ84CIbYcrCUAP6Mg59aZfu6OZDGQyJbQ,7479
 cherrypy_foundation/plugins/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cherrypy_foundation/plugins/tests/test_db.py,sha256=PELi5ojj8VqcXyPbpaig2Ac4ZqlR_gEPGUYrWJPANWg,3921
-cherrypy_foundation/plugins/tests/test_ldap.py,sha256=7EhFvhxwDCCBoNlAD5XpZxLtKvkrjpQxrtCHMT9wkQ4,14393
+cherrypy_foundation/plugins/tests/test_ldap.py,sha256=j0QUIxqeEBgN4VLvczUlw0xMM_ldPWVHCceAJzU71Jg,17269
 cherrypy_foundation/plugins/tests/test_scheduler.py,sha256=I-ZuQhMvCCvqFDwukwsyz_UkdJJ8JSLTkAanUo24GCE,3564
 cherrypy_foundation/plugins/tests/test_scheduler_db.py,sha256=-iZnLgb3qsJzs0p7JAw6TQswRtExCmHAtYXqRNPZn7U,3101
 cherrypy_foundation/plugins/tests/test_smtp.py,sha256=qs5yezIpSXkBmLmFlqckfPW7NmntHZxQjDSkdQG_dNE,4183
@@ -104,7 +104,7 @@ cherrypy_foundation/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 cherrypy_foundation/tools/auth.py,sha256=lTSajxCiReMzm-Fl-xhTByi4yFnInEWOoNsmUMnHQhs,9761
 cherrypy_foundation/tools/auth_mfa.py,sha256=VaLvBz9wo6jTx-2mCGqFXPxl-z14f8UMWvd6_xeXd40,9212
 cherrypy_foundation/tools/errors.py,sha256=ELpAj0N9kIxC22QW5xDQJz60zMpCwgm-Twu2WpELM1A,1005
-cherrypy_foundation/tools/i18n.py,sha256=VQJs7hIv-BM9_FIU6-pwRp65eeroHoQLU7QrV5V_rbI,14641
+cherrypy_foundation/tools/i18n.py,sha256=GXNh1SIWXrs3EScHkw9lqsvUC8PUeIv514HyTrc78y0,16229
 cherrypy_foundation/tools/jinja2.py,sha256=nppYnk2ASDsyfNHF9m83W4foiN3MhcwDJvo5baEgnGU,5520
 cherrypy_foundation/tools/ratelimit.py,sha256=pT7vZRmjltNeuiQpdyXOmnpG9BcXjLaj-AXJ0e2x_zw,8300
 cherrypy_foundation/tools/secure_headers.py,sha256=Yh-iA_Js4MUsx5nq4ilbc-iWy90ZC0oMb3TJJD_UwYo,3921
@@ -112,22 +112,20 @@ cherrypy_foundation/tools/sessions_timeout.py,sha256=6iBWJntPMk_Qt94fBSfBISf1IXI
 cherrypy_foundation/tools/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cherrypy_foundation/tools/tests/test_auth.py,sha256=oeM5t38M8DUC9dYn59dcf00jdGY6Ry0jZWhQd_PYQUk,2847
 cherrypy_foundation/tools/tests/test_auth_mfa.py,sha256=911hnBbdg5CKb613uIBrlggoTAyBU9SoL7Sxd-tIKS0,15008
-cherrypy_foundation/tools/tests/test_i18n.py,sha256=T9j9fF7AwH_H4TJnC4CbAOS1a1D2Z4xPxaOmiP0By34,9091
+cherrypy_foundation/tools/tests/test_i18n.py,sha256=hIpdKSwA9bwePnABjUah7ptTWKW1tWKzwkj8n1nEs0s,9390
 cherrypy_foundation/tools/tests/test_jinja2.py,sha256=_dkRJpjB0ybDV6YO0uEFFO8LAcWgVu3VBB8_vWthQ48,4296
 cherrypy_foundation/tools/tests/test_ratelimit.py,sha256=rrqybwMbh1GFlF2-Ut57zHPAc1uqX88aqea6VS_6p5E,3449
 cherrypy_foundation/tools/tests/components/Button.jinja,sha256=uSLp1GpEIgZNXK_GWglu0E_a1c3jHpDLI66MRfMqGhE,95
 cherrypy_foundation/tools/tests/locales/messages.pot,sha256=5K9piTRL7H5MxDXFIWJsCccSJRA0HwfCQQU8b8VYo30,40
 cherrypy_foundation/tools/tests/locales/de/LC_MESSAGES/messages.mo,sha256=bsJTVL4OefevkxeHDS3VcW3egP6Yq18LFXwjSyoqIng,336
 cherrypy_foundation/tools/tests/locales/de/LC_MESSAGES/messages.po,sha256=glzYY96jmCaGyxYtMqmNF-1q-OYWXBIkMysvbXO4L6E,351
-cherrypy_foundation/tools/tests/locales/en/LC_MESSAGES/messages.mo,sha256=cdyG2Js1TIU6eenDX1ICH8uP45yvl0OLN0-SMUXTBa4,259
-cherrypy_foundation/tools/tests/locales/en/LC_MESSAGES/messages.po,sha256=JCpiRLLHUSYQhzta8ZYjfB50NmpwPGNCTNwo2Glww14,322
 cherrypy_foundation/tools/tests/locales/fr/LC_MESSAGES/messages.mo,sha256=u3_kl_nqZ3FNaSyKVQKmu4KJzN3xOxxJNVmcdhw37jA,327
 cherrypy_foundation/tools/tests/locales/fr/LC_MESSAGES/messages.po,sha256=6_Sk9Igqm7dtpyyS701p5qc4DvOJE7TRT0ajRZctFAQ,342
 cherrypy_foundation/tools/tests/templates/test_jinja2.html,sha256=v9AHxksbBvzE7sesPqE61HMhsvU4juXt3E0ZQo-zXVQ,190
 cherrypy_foundation/tools/tests/templates/test_jinja2_i18n.html,sha256=98S51dgG7Vb4rvMZNZvomw1D9pBiM4g6pdlxAgvrxXA,373
 cherrypy_foundation/tools/tests/templates/test_jinjax.html,sha256=NT19UaUzm8FRKOIc6H6HNGPDJU6KATnakd8zf3BCeAs,153
-cherrypy_foundation-1.0.0a11.dist-info/licenses/LICENSE.md,sha256=trSLYs5qlaow_bBwsLTRKpmTXsXzFksM_YUCMqrgAJQ,35149
-cherrypy_foundation-1.0.0a11.dist-info/METADATA,sha256=01n5K1GISPi32NOQ8r3x1eV6qNd5x7ZS0tpJON9mUe4,2023
-cherrypy_foundation-1.0.0a11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cherrypy_foundation-1.0.0a11.dist-info/top_level.txt,sha256=B1vQPTLYhpKJ6W0JkRCWyAf8RPcnwJWdYxixv75-4ew,20
-cherrypy_foundation-1.0.0a11.dist-info/RECORD,,
+cherrypy_foundation-1.0.0a13.dist-info/licenses/LICENSE.md,sha256=trSLYs5qlaow_bBwsLTRKpmTXsXzFksM_YUCMqrgAJQ,35149
+cherrypy_foundation-1.0.0a13.dist-info/METADATA,sha256=KYmjHwbA7u8dgIzKxb5ILWHMpC9blo3A46l2CBfDa4U,2023
+cherrypy_foundation-1.0.0a13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cherrypy_foundation-1.0.0a13.dist-info/top_level.txt,sha256=B1vQPTLYhpKJ6W0JkRCWyAf8RPcnwJWdYxixv75-4ew,20
+cherrypy_foundation-1.0.0a13.dist-info/RECORD,,

cherrypy_foundation/tools/tests/locales/en/LC_MESSAGES/messages.po

@@ -1,15 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \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 ""