From 91c985b3e876cb9cc53f7042ed88e6247b29606f Mon Sep 17 00:00:00 2001 From: Tyler Kennedy Date: Thu, 31 Jul 2014 11:07:09 -0400 Subject: [PATCH 1/2] Update database.py Inverted logic means _release_internal will always fail on a rollback. Fixed and simplified. --- dataset/persistence/database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataset/persistence/database.py b/dataset/persistence/database.py index d87963a..3a5f18f 100644 --- a/dataset/persistence/database.py +++ b/dataset/persistence/database.py @@ -80,7 +80,7 @@ class Database(object): self.local.must_release = True def _release_internal(self): - if not hasattr(self.local, 'must_release') and self.local.must_release: + if getattr(self.local, 'must_release', None): self.lock.release() self.local.must_release = False From f7b7d1f9e60ba6300fc6305bf58c022b0d31a79e Mon Sep 17 00:00:00 2001 From: Tyler Kennedy Date: Thu, 31 Jul 2014 11:08:07 -0400 Subject: [PATCH 2/2] Update setup.py Bugfix version bump. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index eb0c54b..ba6ed1a 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ if sys.version_info[:2] <= (2, 6): setup( name='dataset', - version='0.5.4', + version='0.5.5', description="Toolkit for Python-based data processing.", long_description="", classifiers=[