cherrypy-foundation 1.0.0a7__tar.gz → 1.0.0a9__tar.gz

{cherrypy_foundation-1.0.0a7 → cherrypy_foundation-1.0.0a9}/.gitlab-ci.yml

@@ -58,6 +58,29 @@ package:py3:
       - dist/*.tar.gz
     expire_in: 1 day
 
+package:deb:
+  stage: package
+  needs: []
+  image: buildpack-deps:$DIST
+  parallel:
+    matrix:
+      - DIST: [trixie]
+  script: |
+    set -x
+    set -e
+    apt update
+    apt -y --no-install-recommends install devscripts lintian
+    apt build-dep -y .
+    export DEBEMAIL=$CI_COMMIT_AUTHOR
+    dch -v "$(python3 -m setuptools_scm)" "automated build"
+    dpkg-buildpackage -b
+    lintian
+    mkdir -p ./dist/$DIST
+    mv ../*.deb ./dist/$DIST/
+  artifacts:
+    paths:
+      - ./dist/*
+
 publish:sonar:
   allow_failure: true
   image: sonarsource/sonar-scanner-cli

{cherrypy_foundation-1.0.0a7/src/cherrypy_foundation.egg-info → cherrypy_foundation-1.0.0a9}/PKG-INFO

@@ -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.0a9/debian/TODO

@@ -0,0 +1 @@
+symlink for all vendor files - bootstrap, jquery, etc.

cherrypy_foundation-1.0.0a9/debian/changelog

@@ -0,0 +1,5 @@
+cherrypy-foundation (1.0.0) unstable; urgency=medium
+
+  * Initial upload to debian.
+
+ -- Patrik Dufresne <patrik@ikus-soft.com>  Tue, 09 Dec 2025 15:01:20 +0400

cherrypy_foundation-1.0.0a9/debian/control

@@ -0,0 +1,61 @@
+Source: cherrypy-foundation
+Section: web
+Priority: optional
+Maintainer: Patrik Dufresne <patrik@ikus-soft.com>
+Build-Depends:
+ chromium-driver,
+ debhelper-compat (= 13),
+ dh-python,
+ dh-sequence-python3,
+ pybuild-plugin-pyproject,
+ python3,
+ python3-all-dev,
+ python3-apscheduler,
+ python3-argon2,
+ python3-babel,
+ python3-cherrypy3,
+ python3-jinja2,
+ python3-jinjax,
+ python3-ldap3,
+ python3-oauthlib,
+ python3-parameterized,
+ python3-pip,
+ python3-pytest, 
+ python3-requests,
+ python3-requests-oauthlib,
+ python3-responses,
+ python3-selenium,
+ python3-setuptools,
+ python3-setuptools-scm,
+ python3-sqlalchemy,
+ python3-tz,
+ python3-wtforms,
+Rules-Requires-Root: no
+Standards-Version: 4.7.0
+Homepage: https://gitlab.com/ikus-soft/cherrypy-foundation
+Vcs-Git: https://gitlab.com/ikus-soft/cherrypy-foundation.git
+Vcs-Browser: https://gitlab.com/ikus-soft/cherrypy-foundation
+
+Package: python3-cherrypy-foundation
+Architecture: all
+Depends:
+ libjs-bootstrap5,
+ libjs-jquery,
+ libjs-jquery-datatables,
+ libjs-jquery-datatables-extensions,
+ ${python3:Depends},
+ ${misc:Depends},
+Suggests:
+ python3-apscheduler,
+ python3-argon2,
+ python3-jinja2,
+ python3-jinjax,
+ python3-ldap3,
+ python3-oauthlib,
+ python3-requests-oauthlib,
+Description: Common utilities and integrations for building CherryPy web applications
+ This project provides a collection of reusable utilities that simplify
+ building web applications with CherryPy. It offers built-in integrations
+ with SQLAlchemy for database access, Jinja2 for templating, WTForms for
+ form handling, and Bootstrap for UI components, helping streamline
+ application development.

cherrypy_foundation-1.0.0a9/debian/copyright

@@ -0,0 +1,27 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: cherrypy-foundation
+Upstream-Contact: Patrik Dufresne <patrik@ikus-soft.com>
+Source: https://gitlab.com/ikus-soft/cherrypy-foundation/-/tags
+Files-Excluded: 
+ src/cherrypy_foundation/components/vendor
+
+Files: *
+Copyright: 2019-2025 Patrik Dufresne <patrik@ikus-soft.com>
+License: GPL-3+
+
+License: GPL-3+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ .
+ The full text of the GNU General Public License version 3
+ can be found in the file /usr/share/common-licenses/GPL-3.

cherrypy_foundation-1.0.0a9/debian/python3-cherrypy-foundation.docs

@@ -0,0 +1 @@
+README.md

cherrypy_foundation-1.0.0a9/debian/rules

@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpkg/pkg-info.mk
+
+export SETUPTOOLS_SCM_PRETEND_VERSION_FOR_RDIFFWEB := $(DEB_VERSION_UPSTREAM)
+
+# Force use of pyproject.toml
+export PYBUILD_SYSTEM=pyproject
+
+# For testing, we need a timezone
+export TZ=UTC
+
+%:
+	dh $@ --buildsystem=pybuild --test-tox
+
+execute_before_dh_auto_clean:
+	rm -rf *.egg-info
+
+# Generate orig.tar.gz
+gentarball: SOURCE=cherrypy-foundation
+gentarball:
+	git archive --format=tar HEAD --prefix=$(SOURCE)-$(DEB_VERSION_UPSTREAM)/ | gzip -9 > ../$(SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
+	mk-origtargz --compression gzip ../$(SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz

cherrypy_foundation-1.0.0a9/debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

cherrypy_foundation-1.0.0a9/debian/source/options

@@ -0,0 +1,25 @@
+# Ignore excluded files in d/copyright
+extend-diff-ignore = "extras"
+extend-diff-ignore = "rdiffweb/static/css/bootstrap.min.css"
+extend-diff-ignore = "rdiffweb/static/css/bootstrap.min.css.map"
+extend-diff-ignore = "rdiffweb/static/css/font-awesome.css.map"
+extend-diff-ignore = "rdiffweb/static/css/font-awesome.min.css"
+extend-diff-ignore = "rdiffweb/static/css/jquery.dataTables.min.css"
+extend-diff-ignore = "rdiffweb/static/css/responsive.dataTables.min.css"
+extend-diff-ignore = "rdiffweb/static/fonts/fontawesome-webfont.eot"
+extend-diff-ignore = "rdiffweb/static/fonts/fontawesome-webfont.svg"
+extend-diff-ignore = "rdiffweb/static/fonts/fontawesome-webfont.woff"
+extend-diff-ignore = "rdiffweb/static/fonts/fontawesome-webfont.woff2"
+extend-diff-ignore = "rdiffweb/static/images/sort_asc.png"
+extend-diff-ignore = "rdiffweb/static/images/sort_asc_disabled.png"
+extend-diff-ignore = "rdiffweb/static/images/sort_both.png"
+extend-diff-ignore = "rdiffweb/static/images/sort_desc.png"
+extend-diff-ignore = "rdiffweb/static/images/sort_desc_disabled.png"
+extend-diff-ignore = "rdiffweb/static/js/bootstrap.bundle.js.map"
+extend-diff-ignore = "rdiffweb/static/js/bootstrap.bundle.min.js"
+extend-diff-ignore = "rdiffweb/static/js/chartkick.min.js"
+extend-diff-ignore = "rdiffweb/static/js/chart.min.js"
+extend-diff-ignore = "rdiffweb/static/js/dataTables.buttons.min.js"
+extend-diff-ignore = "rdiffweb/static/js/dataTables.responsive.min.js"
+extend-diff-ignore = "rdiffweb/static/js/jquery.dataTables.min.js"
+extend-diff-ignore = "rdiffweb/static/js/jquery.min.js"

cherrypy_foundation-1.0.0a9/debian/upstream/metadata

@@ -0,0 +1,5 @@
+Name: rdiffweb
+Bug-Database: https://gitlab.com/ikus-soft/cherrypy-foundation/-/issues
+Contact: https://gitlab.com/ikus-soft/cherrypy-foundation/-/project_members
+Repository: git://git@gitlab.com:ikus-soft/cherrypy-foundation.git
+Repository-Browse: https://gitlab.com/ikus-soft/cherrypy-foundation/

{cherrypy_foundation-1.0.0a7 → cherrypy_foundation-1.0.0a9}/src/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-1.0.0a7 → cherrypy_foundation-1.0.0a9}/src/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-1.0.0a7 → cherrypy_foundation-1.0.0a9}/src/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-1.0.0a7 → cherrypy_foundation-1.0.0a9}/src/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-1.0.0a7 → cherrypy_foundation-1.0.0a9}/src/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-1.0.0a7 → cherrypy_foundation-1.0.0a9}/src/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-1.0.0a7 → cherrypy_foundation-1.0.0a9}/src/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-1.0.0a9/src/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-1.0.0a7 → cherrypy_foundation-1.0.0a9}/src/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 → cherrypy_foundation-1.0.0a9/src/cherrypy_foundation.egg-info}/PKG-INFO

@@ -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 → cherrypy_foundation-1.0.0a9}/src/cherrypy_foundation.egg-info/SOURCES.txt

@@ -5,6 +5,16 @@ README.md
 pyproject.toml
 sonar-project.properties
 tox.ini
+debian/TODO
+debian/changelog
+debian/control
+debian/copyright
+debian/python3-cherrypy-foundation.docs
+debian/python3-cherrypy-foundation.links
+debian/rules
+debian/source/format
+debian/source/options
+debian/upstream/metadata
 src/cherrypy_foundation/__init__.py
 src/cherrypy_foundation/error_page.py
 src/cherrypy_foundation/flash.py
@@ -128,6 +138,8 @@ src/cherrypy_foundation/tools/tests/test_jinja2.py
 src/cherrypy_foundation/tools/tests/test_ratelimit.py
 src/cherrypy_foundation/tools/tests/components/Button.jinja
 src/cherrypy_foundation/tools/tests/locales/messages.pot
+src/cherrypy_foundation/tools/tests/locales/de/LC_MESSAGES/messages.mo
+src/cherrypy_foundation/tools/tests/locales/de/LC_MESSAGES/messages.po
 src/cherrypy_foundation/tools/tests/locales/en/LC_MESSAGES/messages.mo
 src/cherrypy_foundation/tools/tests/locales/en/LC_MESSAGES/messages.po
 src/cherrypy_foundation/tools/tests/locales/fr/LC_MESSAGES/messages.mo

{cherrypy_foundation-1.0.0a7 → cherrypy_foundation-1.0.0a9}/tox.ini

@@ -29,7 +29,6 @@ deps =
   trixie: sqlalchemy==2.0.40
   trixie: wtforms==3.2.1
   trixie: CherryPy==18.10.0
-  trixie: configargparse==1.7
   trixie: Jinja2==3.1.6
   #trixie: jinjax==0.57 Trixie required backported version
 extras = test