cherrypy-foundation 1.0.0a19__py3-none-any.whl → 1.0.0a20__py3-none-any.whl

cherrypy_foundation/flash.py

@@ -16,7 +16,7 @@
 
 from collections import namedtuple
 
-import cherrypy
+from cherrypy_foundation.sessions import session_lock
 
 FlashMessage = namedtuple('FlashMessage', ['message', 'level'])
 
@@ -27,22 +27,24 @@ def flash(message, level='info'):
     """
     assert message
     assert level in ['info', 'error', 'warning', 'success']
-    if 'flash' not in cherrypy.session:
-        cherrypy.session['flash'] = []
-    # Support Markup and string
-    if hasattr(message, '__html__'):
-        flash_message = FlashMessage(message, level)
-    else:
-        flash_message = FlashMessage(str(message), level)
-    cherrypy.session['flash'].append(flash_message)
+    with session_lock() as session:
+        if 'flash' not in session:
+            session['flash'] = []
+        # Support Markup and string
+        if hasattr(message, '__html__'):
+            flash_message = FlashMessage(message, level)
+        else:
+            flash_message = FlashMessage(str(message), level)
+        session['flash'].append(flash_message)
 
 
 def get_flashed_messages():
     """
     Return all flash message.
     """
-    if 'flash' in cherrypy.session:
-        messages = cherrypy.session['flash']
-        del cherrypy.session['flash']
-        return messages
+    with session_lock() as session:
+        if 'flash' in session:
+            messages = session['flash']
+            del session['flash']
+            return messages
     return []

cherrypy_foundation/tests/test_form.py

@@ -69,7 +69,7 @@ class LoginForm(CherryForm):
     )
 
 
-@cherrypy.tools.sessions(locking='explicit')
+@cherrypy.tools.sessions()
 @cherrypy.tools.jinja2(env=env)
 class Root:
 

{cherrypy_foundation-1.0.0a19.dist-info → cherrypy_foundation-1.0.0a20.dist-info}/METADATA

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

{cherrypy_foundation-1.0.0a19.dist-info → cherrypy_foundation-1.0.0a20.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cherrypy_foundation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cherrypy_foundation/error_page.py,sha256=GEg_KZGRE63ZsTTtmrEpE9GsYcm6shZvp5KLR53sIMA,3248
-cherrypy_foundation/flash.py,sha256=qCghKgVgtjbQVrm6xyIIfRKzf03njFHh6b4tnawzkUM,1542
+cherrypy_foundation/flash.py,sha256=vraKvmYmjdV1cGsPSxTLVsekwqOnoyiVPqKjv6UW5OU,1646
 cherrypy_foundation/form.py,sha256=8zp72fpYrmMGsIK5LxVY7sL_qqhoMDnIQoMND1s6CXk,3994
 cherrypy_foundation/logging.py,sha256=JyzcuAu3HWzvMTSFBuKpwgnJLz1lRlx-j6EkuTwlb6I,3463
 cherrypy_foundation/passwd.py,sha256=iyz3SgcvpgxsZgPUoTEXiqdKtwOANPrRKYhVPm2d_NQ,2139
@@ -97,7 +97,7 @@ cherrypy_foundation/plugins/tests/test_smtp.py,sha256=LYUXjDe8TtyruBSm18N73nSxHi
 cherrypy_foundation/tests/__init__.py,sha256=bbdyalzM2mwBbId-7JBPXYuRzk7oUBCncq33ypD9v3Y,2818
 cherrypy_foundation/tests/test_error_page.py,sha256=EmsCXYkFFMReNSORZYCo7qKvL2x98QgtKIlv1nFKIUU,2399
 cherrypy_foundation/tests/test_flash.py,sha256=NNbT3XI1dHk0hXqJsWndCmPPohK9ig87ZYJaRNPJxR8,1994
-cherrypy_foundation/tests/test_form.py,sha256=wfmKcWTEOPi6BOAUy9oDfkX7LJf9DfxtNRER8R3Ma2g,5560
+cherrypy_foundation/tests/test_form.py,sha256=-2h38e00hWlYNJeVWrUB2V11UZ3x0FmTcsCez5vWoas,5542
 cherrypy_foundation/tests/test_logging.py,sha256=Lg1yGwFHTSpGbPvNXBi9risypZziJlAOMi1DeennxRs,2623
 cherrypy_foundation/tests/test_passwd.py,sha256=nGqJZYwRPziifLvf5rm3YifxAvIOFdU_6LkHaUvRk8w,1951
 cherrypy_foundation/tests/test_url.py,sha256=sSNwK7KZJcrLtnf_XROYQAPQoYNO5lAsa2BjhFjgmws,6434
@@ -128,8 +128,8 @@ cherrypy_foundation/tools/tests/locales/fr/LC_MESSAGES/messages.po,sha256=6_Sk9I
 cherrypy_foundation/tools/tests/templates/test_jinja2.html,sha256=s1bHmy-lyf0YW0t-LOx3ugILV2kqFoBNYxziWgrZbo0,216
 cherrypy_foundation/tools/tests/templates/test_jinjax.html,sha256=NImzIW0mUHxilFd61PSoxFC-yu1nayEVwv-5zlgD9yo,179
 cherrypy_foundation/tools/tests/templates/test_jinjax_i18n.html,sha256=yre8j7HBjpTQZHpM0PuB3ASGD3O4vKkJ-y72Fm6STgY,771
-cherrypy_foundation-1.0.0a19.dist-info/licenses/LICENSE.md,sha256=trSLYs5qlaow_bBwsLTRKpmTXsXzFksM_YUCMqrgAJQ,35149
-cherrypy_foundation-1.0.0a19.dist-info/METADATA,sha256=etkiHbuCu6NKyrzniIbKIfhxMKdwIVfr6A3XGHy6yyo,3551
-cherrypy_foundation-1.0.0a19.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-cherrypy_foundation-1.0.0a19.dist-info/top_level.txt,sha256=B1vQPTLYhpKJ6W0JkRCWyAf8RPcnwJWdYxixv75-4ew,20
-cherrypy_foundation-1.0.0a19.dist-info/RECORD,,
+cherrypy_foundation-1.0.0a20.dist-info/licenses/LICENSE.md,sha256=trSLYs5qlaow_bBwsLTRKpmTXsXzFksM_YUCMqrgAJQ,35149
+cherrypy_foundation-1.0.0a20.dist-info/METADATA,sha256=5aY_cGJ0ziWu_GUyinwsYjM2oPEWsgCpkJS01kaOsjg,3551
+cherrypy_foundation-1.0.0a20.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+cherrypy_foundation-1.0.0a20.dist-info/top_level.txt,sha256=B1vQPTLYhpKJ6W0JkRCWyAf8RPcnwJWdYxixv75-4ew,20
+cherrypy_foundation-1.0.0a20.dist-info/RECORD,,