cherrypy-foundation 1.0.0a7__py3-none-any.whl → 1.0.0a9__py3-none-any.whl

cherrypy_foundation/components/Field.jinja

@@ -1,4 +1,6 @@
 {# def field, floating=False #}
+{#css vendor/bootstrap5/css/bootstrap.min.css #}
+{#js vendor/jquery/jquery.min.js, vendor/popper/popper.min.js, vendor/bootstrap5/js/bootstrap.min.js #}
 {# djlint:off #}
 {% set bootstrap_class_table = {
   "CheckboxInput": ("form-check-input", "form-check-label", False, True),

cherrypy_foundation/components/Fields.jinja

@@ -1,6 +1,4 @@
 {# def form, floating=False #}
-{#css vendor/bootstrap5/css/bootstrap.min.css #}
-{#js vendor/jquery/jquery.min.js, vendor/popper/popper.min.js, vendor/bootstrap5/js/bootstrap.min.js #}
 <div class="row">
   {% for id, field in form._fields.items() %}<Field field={{ field }} floating={{ floating }} />{% endfor %}
 </div>

cherrypy_foundation/error_page.py

@@ -63,7 +63,7 @@ def error_page(status='', message='', traceback='', version=''):
         )
 
     # Replace message by generic one for 404. Default implementation leak path info.
-    if status == '404 Not Found':
+    if status == '404 Not Found' and cherrypy.serving.request.path_info in message:
         message = 'Nothing matches the given URI'
 
     # Check expected response type.

cherrypy_foundation/tests/test_error_page.py

@@ -29,6 +29,10 @@ class Root:
 
     @cherrypy.expose
     def not_found(self):
+        raise cherrypy.NotFound()
+
+    @cherrypy.expose
+    def not_found_custom(self):
         raise cherrypy.HTTPError(404, message='My error message')
 
     @cherrypy.expose
@@ -60,6 +64,8 @@ class ErrorPageTest(helper.CPWebCase):
 
     @parameterized.expand(
         [
+            ('/not_found', '<p>Nothing matches the given URI</p>'),
+            ('/not_found_custom', '<p>My error message</p>'),
             ('/html_error', '<p>My error message</p>'),
             ('/json_error', '{"message": "json error message", "status": "400 Bad Request"}'),
             ('/text_error', 'text error message'),

cherrypy_foundation/tests/test_flash.py

@@ -57,6 +57,5 @@ class FormTest(helper.CPWebCase):
         self.assertStatus(200)
         # Then page display the message.
         self.assertInBody('test-flash')
-        self.assertInBody('<div class="mb-2 flash-messages" style="min-height:100px">')
         self.assertInBody('<div class="alert alert-info alert-dismissible fade show"')
         self.assertInBody('default flash message')

cherrypy_foundation/tests/test_form.py

@@ -109,8 +109,8 @@ class FormTest(helper.CPWebCase):
             '<input class="form-check-input" container-class="col-sm-6" id="persistent" label-attr="FOO" name="persistent" type="checkbox" value="y">'
         )
         self.assertInBody('<label attr="FOO" class="form-check-label" for="persistent">Remember me</label>')
-        # 5. check submit button
-        self.assertInBody('<div  attr="BAR" class="mb-2 form-field col-sm-6">')
-        self.assertInBody(
-            '<input class="btn-primary float-end btn" container-attr="BAR" container-class="col-sm-6" id="submit" name="submit" type="submit" value="Login">'
+        # 5. check submit button (regex matches because class could have different order with jinjax<=0.57)
+        self.assertInBody('<div  attr="BAR"')
+        self.assertMatchesBody(
+            '<input class="(btn-primary ?|float-end ?|btn ?){3}" container-attr="BAR" container-class="col-sm-6" id="submit" name="submit" type="submit" value="Login">'
         )

cherrypy_foundation/tools/i18n.py

@@ -162,7 +162,7 @@ def preferred_timezone(timezone):
 
 
 @lru_cache(maxsize=10)
-def _search_translation(dirname, domain, *langs):
+def _search_translation(dirname, domain, *locales):
     """
     Loads the first existing translations for known locale.
 
@@ -177,15 +177,19 @@ def _search_translation(dirname, domain, *langs):
 
     :returns: Translations, the corresponding Locale object.
     """
-    if not isinstance(langs, (list, tuple)):
-        langs = [langs]
-    t = Translations.load(dirname, langs, domain)
+    if not isinstance(locales, (list, tuple)):
+        locales = [locales]
+    t = Translations.load(dirname, locales, domain)
     # Ignore null translation
     if t.__class__ is NullTranslations:
         return None
-    # Get Locale from file name
-    lang = t.files[0].split('/')[-3]
-    t.locale = Locale.parse(lang)
+    # Assign prefered local to this translation to know the current locale.
+    trans_locale = Locale.parse(t.files[0].split('/')[-3])
+    for locale in locales:
+        locale = Locale.parse(locale)
+        if trans_locale == locale or trans_locale.language == locale.language:
+            t.locale = locale
+            break
     return t
 
 
@@ -424,7 +428,9 @@ def _set_content_language(**kwargs):
     language of `cherrypy.response.i18n.locale`.
     """
     if 'Content-Language' not in cherrypy.response.headers:
-        cherrypy.response.headers['Content-Language'] = str(get_translation().locale)
+        locale = get_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/locales/de/LC_MESSAGES/messages.po

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

cherrypy_foundation/tools/tests/test_i18n.py

@@ -83,6 +83,13 @@ 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")])
@@ -93,13 +100,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")
+        self.assertHeaderItemValue("Content-Language", "en-US")
         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")
+        self.assertHeaderItemValue("Content-Language", "en-US")
         self.assertInBody(TEXT_EN)
 
     def test_language_fr(self):
@@ -107,7 +114,7 @@ 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")
+        self.assertHeaderItemValue("Content-Language", "fr-CA")
         self.assertInBody(TEXT_FR)
 
     def test_with_preferred_lang(self):
@@ -125,6 +132,42 @@ 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('CET'):
+            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'))
+
 
 class TestI18nDefaultLangWebCase(AbstractI18nTest):
     default_lang = 'FR'

{cherrypy_foundation-1.0.0a7.dist-info → cherrypy_foundation-1.0.0a9.dist-info}/METADATA

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

{cherrypy_foundation-1.0.0a7.dist-info → cherrypy_foundation-1.0.0a9.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cherrypy_foundation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cherrypy_foundation/error_page.py,sha256=Mz47u6n4eqQ85LKT9lWglqPPtmizikY9xBsrhGl7_nI,3198
+cherrypy_foundation/error_page.py,sha256=rAFr4Oc_xjIQn7sQbng5Z0r-bgqy8T3LwtCa2tv7M3A,3248
 cherrypy_foundation/flash.py,sha256=fFRbutUX6c1lVHqjehmO9y98dJgmfNCjhd76t2mth2s,1542
 cherrypy_foundation/form.py,sha256=8c9dO0o47sK3CBosTkGXoVRtzNQwY0aw0vNZfTqmhvo,3994
 cherrypy_foundation/logging.py,sha256=YIOK5ZAZLCv52YDdP66yBYpEX1C336JnI3wnrTKl1Lw,3468
@@ -11,9 +11,9 @@ cherrypy_foundation/components/Datatable.css,sha256=7wSwgdA61vYCdEuQ0bp2o0oSvu5m
 cherrypy_foundation/components/Datatable.jinja,sha256=K-24vpN5TO8Jk2COvuC5uBaCj3PFLd6ubr28JHFq3KM,3375
 cherrypy_foundation/components/Datatable.js,sha256=jiV78bJPNMTLcjrX03vaYcsEdRbI6ctzSvCo880H8Hw,12072
 cherrypy_foundation/components/Field.css,sha256=CtOkvIbix7ykrOKLJxQJLJsWfEwFqfducJ1BH2vlMvA,244
-cherrypy_foundation/components/Field.jinja,sha256=R-ZUm88XXOb3zi_hysTuwFUCGGR67A59P4TT5d1Qo_o,3152
+cherrypy_foundation/components/Field.jinja,sha256=-oaFdyZe32kBg3iO2w48yYPnKwxl0tyFr8HrYUm9H0U,3305
 cherrypy_foundation/components/Field.js,sha256=SFixZ62WlLq7SSCEazMAGhSnc9EnQ1wg6PZX4ayO6ZE,2047
-cherrypy_foundation/components/Fields.jinja,sha256=UDu1txwMguvr7dyga9PXepEhFvz9C6ZvchBnhQCWgHI,318
+cherrypy_foundation/components/Fields.jinja,sha256=_8Or6DOlciKjRao-sdBpLs--bx5V-K80X3hDEA1VKCQ,165
 cherrypy_foundation/components/Flash.jinja,sha256=COy44drQsXpbZajjJS4w_9NMPYFdMfUNdfhd7SbFdYA,442
 cherrypy_foundation/components/Icon.jinja,sha256=Z1RGYBg5xlDEoUy3glqb_k_LEjkJHeCxQXqDEvWzEF4,135
 cherrypy_foundation/components/SideBySideMultiSelect.css,sha256=_poMY9O8rvDsOh01pQLf9qtg1Gm4eCM2HsM_ekC5zkk,503
@@ -91,9 +91,9 @@ cherrypy_foundation/plugins/tests/test_ldap.py,sha256=7EhFvhxwDCCBoNlAD5XpZxLtKv
 cherrypy_foundation/plugins/tests/test_scheduler.py,sha256=I-ZuQhMvCCvqFDwukwsyz_UkdJJ8JSLTkAanUo24GCE,3564
 cherrypy_foundation/plugins/tests/test_smtp.py,sha256=qs5yezIpSXkBmLmFlqckfPW7NmntHZxQjDSkdQG_dNE,4183
 cherrypy_foundation/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cherrypy_foundation/tests/test_error_page.py,sha256=8u5p6lv_I4XvfGipjJXNFwW7G1N8AK8IOnc_Th-Ebto,2181
-cherrypy_foundation/tests/test_flash.py,sha256=OMoEKy4xaYT75OZ4bdL3Vb3jDRBNP_Wr3BaVAlkO9V4,2064
-cherrypy_foundation/tests/test_form.py,sha256=KvVA7OEqaDR-A-1EJdA-WlXkqyK9YJkRHhoUvGx1zr8,4269
+cherrypy_foundation/tests/test_error_page.py,sha256=8yLK8OGbJIdUjilFIHMNBZadLKHrXnD6KSmQ3Da4LaQ,2399
+cherrypy_foundation/tests/test_flash.py,sha256=JqZDAgazlNnP3HcPFmFOWbPeDDMzc6z5fHNe-pBTin0,1976
+cherrypy_foundation/tests/test_form.py,sha256=sWsPWyXwAVkCeP5t0qIHc0Oi32Zi3kztoQ_wlDR9STc,4326
 cherrypy_foundation/tests/test_passwd.py,sha256=gC5O4yhHyU1YRYuDc0pG0T_5zvrG2qrr6P822iyK3Rg,1956
 cherrypy_foundation/tests/test_url.py,sha256=W-RTKQuxYS2KXxCYTTtnKcxfdP9F6Fp3QKY_sBTnBmE,6434
 cherrypy_foundation/tests/templates/test_flash.html,sha256=MyOPsHQX97TB30sbKrbG3tagKDyvV8OVKp-UOrw7REc,187
@@ -103,7 +103,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=5pcyr7AleaqSj9rCESthvMIbNIORp-8351uJgmi2xog,14172
+cherrypy_foundation/tools/i18n.py,sha256=TpyYYCtgXblGcnB9rybaoiH1y7IEKFH6jvbitrKtxfk,14535
 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
@@ -111,11 +111,13 @@ 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=-bJuKn8PHHidBWhoFSVr4PdX96m3A50YY4i5osyU7DY,6251
+cherrypy_foundation/tools/tests/test_i18n.py,sha256=urkOnXYQDxoxeBOm_Ud5IK0n50rJM59X6tEtEjQqRUM,9082
 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
@@ -123,8 +125,8 @@ cherrypy_foundation/tools/tests/locales/fr/LC_MESSAGES/messages.po,sha256=6_Sk9I
 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.0a7.dist-info/licenses/LICENSE.md,sha256=trSLYs5qlaow_bBwsLTRKpmTXsXzFksM_YUCMqrgAJQ,35149
-cherrypy_foundation-1.0.0a7.dist-info/METADATA,sha256=ijef0IFNw9vsQRxuexXc07h4_OWHPgIIQSmj5FQDY-w,2022
-cherrypy_foundation-1.0.0a7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cherrypy_foundation-1.0.0a7.dist-info/top_level.txt,sha256=B1vQPTLYhpKJ6W0JkRCWyAf8RPcnwJWdYxixv75-4ew,20
-cherrypy_foundation-1.0.0a7.dist-info/RECORD,,
+cherrypy_foundation-1.0.0a9.dist-info/licenses/LICENSE.md,sha256=trSLYs5qlaow_bBwsLTRKpmTXsXzFksM_YUCMqrgAJQ,35149
+cherrypy_foundation-1.0.0a9.dist-info/METADATA,sha256=kkEaxI9-7XJc32TpM7GXcnkoQmkG1nXCPsshgKl96OM,2022
+cherrypy_foundation-1.0.0a9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cherrypy_foundation-1.0.0a9.dist-info/top_level.txt,sha256=B1vQPTLYhpKJ6W0JkRCWyAf8RPcnwJWdYxixv75-4ew,20
+cherrypy_foundation-1.0.0a9.dist-info/RECORD,,