diff --git a/CHANGELOG b/CHANGELOG index ed5cd381..6529079d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,7 +12,7 @@ - db = DAL('mongodb://127.0.0.1:5984/db') (experimental, thanks Mark Breedveld) - db = DAL('cubrid') (experimental) - db = DAL('postgres:pg8000:...') and DAL('postgres:psycopg2:...') -- pg8000 now ships with web2py )thanks Mariano) +- pg8000 now ships with web2py (thanks Mariano) - reponse.delimiters = ('\\[','\\]') (thanks Denes) - auth.user_groups stores user groups - auth.is_impersonating() diff --git a/VERSION b/VERSION index d5441542..e7eff220 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.5 (2012-03-01 15:20:14) stable +Version 1.99.5 (2012-03-02 10:03:17) stable diff --git a/gluon/storage.py b/gluon/storage.py index 0e00bff7..8de0359c 100644 --- a/gluon/storage.py +++ b/gluon/storage.py @@ -174,7 +174,7 @@ class StorageList(Storage): def load_storage(filename): fp = None try: - fp = portalocker.LockFile(filename, 'rb') + fp = portalocker.LockedFile(filename, 'rb') storage = cPickle.load(fp) finally: if fp: fp.close() @@ -184,7 +184,7 @@ def load_storage(filename): def save_storage(storage, filename): fp = None try: - fp = portalocker.LockFile(filename, 'wb') + fp = portalocker.LockedFile(filename, 'wb') cPickle.dump(dict(storage), fp) finally: if fp: fp.close()