concurrency.api.disable_concurrency is now a noop if applied to a model not under concurrency management

Author: saxix

CHANGES

@@ -4,6 +4,8 @@ Release 1.1 (dev)
 * add support for pypy
 * new :class:`concurrency.fields.ConditionalVersionField`
 * new decorator :class:`concurrency.api.concurrency_disable_increment`
+* :class:`concurrency.api.disable_concurrency` is now a noop if applied to a model not under concurrency management
+
 
 Release 1.0.1
 -------------

docs/api.rst

@@ -183,6 +183,10 @@ concurrency on any Model.
 This features has been developed to be used in django commands
 
 
+.. versionchanged:: 1.1
+
+Does not raise an exception if a model not under concurrency management is passed as argument.
+
 examples
 ~~~~~~~~
 

docs/install.rst

@@ -39,6 +39,6 @@ How to run the tests
 
 .. code-block:: bash
 
-        $ pip tox
+        $ pip install tox
         $ tox
 

src/concurrency/api.py

@@ -114,8 +114,11 @@ class disable_concurrency(object):
     def __init__(self, model=None):
         self.model = model
         self.old_value = conf.ENABLED
+        self.concurrency_managed = (model is None) or hasattr(model, '_concurrencymeta')
 
     def __enter__(self):
+        if not self.concurrency_managed:
+            return
         if self.model is None:
             self.old_value, conf.ENABLED = conf.ENABLED, False
         elif isinstance(self.model, Model):
@@ -125,6 +128,8 @@ def __enter__(self):
             self.old_value, self.model._concurrencymeta.enabled = self.model._concurrencymeta.enabled, False
 
     def __exit__(self, *args, **kwds):
+        if not self.concurrency_managed:
+            return
         if self.model is None:
             conf.ENABLED = self.old_value
         elif isinstance(self.model, Model):