fixed portalocker in Storage, restored appadmin

2012-08-21 22:19:43 -05:00
parent ebe6d0283e
commit 054b9c672c
3 changed files with 3 additions and 2 deletions
@@ -1 +1 @@
-Version 2.00.0 (2012-08-21 22:07:13) dev
+Version 2.00.0 (2012-08-21 22:19:37) dev
@@ -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

@@ -13,6 +13,7 @@ Provides:
 """

 import cPickle
+import portalocker

 __all__ = ['List', 'Storage', 'Settings', 'Messages',
           'StorageList', 'load_storage', 'save_storage']