diff --git a/VERSION b/VERSION index d87f7d64..384cddd0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-08-21 22:07:13) dev +Version 2.00.0 (2012-08-21 22:19:37) dev diff --git a/gluon/fileutils.py b/gluon/fileutils.py index 28ef4a8f..f66c5fb7 100644 --- a/gluon/fileutils.py +++ b/gluon/fileutils.py @@ -318,7 +318,7 @@ def get_session(request, other_application='admin'): session_id = request.cookies['session_id_' + other_application].value osession = storage.load_storage(os.path.join( up(request.folder), other_application, 'sessions', session_id)) - except: + except Exception, e: osession = storage.Storage() return osession diff --git a/gluon/storage.py b/gluon/storage.py index 9ec86b37..bce84c80 100644 --- a/gluon/storage.py +++ b/gluon/storage.py @@ -13,6 +13,7 @@ Provides: """ import cPickle +import portalocker __all__ = ['List', 'Storage', 'Settings', 'Messages', 'StorageList', 'load_storage', 'save_storage']