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

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-1.0.0a7.dist-info → cherrypy_foundation-1.0.0a8.dist-info}/METADATA

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

{cherrypy_foundation-1.0.0a7.dist-info → cherrypy_foundation-1.0.0a8.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
@@ -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
@@ -123,8 +123,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.0a8.dist-info/licenses/LICENSE.md,sha256=trSLYs5qlaow_bBwsLTRKpmTXsXzFksM_YUCMqrgAJQ,35149
+cherrypy_foundation-1.0.0a8.dist-info/METADATA,sha256=7aXt2rwg_HACqXWiWHeFxkJN0wrVNWylVJZbf9M-L-8,2022
+cherrypy_foundation-1.0.0a8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cherrypy_foundation-1.0.0a8.dist-info/top_level.txt,sha256=B1vQPTLYhpKJ6W0JkRCWyAf8RPcnwJWdYxixv75-4ew,20
+cherrypy_foundation-1.0.0a8.dist-info/RECORD,,