fixed portalocker in Storage, restored appadmin
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 2.00.0 (2012-08-21 22:07:13) dev
|
Version 2.00.0 (2012-08-21 22:19:37) dev
|
||||||
|
|||||||
+1
-1
@@ -318,7 +318,7 @@ def get_session(request, other_application='admin'):
|
|||||||
session_id = request.cookies['session_id_' + other_application].value
|
session_id = request.cookies['session_id_' + other_application].value
|
||||||
osession = storage.load_storage(os.path.join(
|
osession = storage.load_storage(os.path.join(
|
||||||
up(request.folder), other_application, 'sessions', session_id))
|
up(request.folder), other_application, 'sessions', session_id))
|
||||||
except:
|
except Exception, e:
|
||||||
osession = storage.Storage()
|
osession = storage.Storage()
|
||||||
return osession
|
return osession
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ Provides:
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
import cPickle
|
import cPickle
|
||||||
|
import portalocker
|
||||||
|
|
||||||
__all__ = ['List', 'Storage', 'Settings', 'Messages',
|
__all__ = ['List', 'Storage', 'Settings', 'Messages',
|
||||||
'StorageList', 'load_storage', 'save_storage']
|
'StorageList', 'load_storage', 'save_storage']
|
||||||
|
|||||||
Reference in New Issue
Block a user