Skip to content

Commit 128d5ac

Browse files
committed
code clean
1 parent 872c113 commit 128d5ac

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

docs/fields.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ ConditionalVersionField
9494

9595
.. versionadded:: 1.1
9696

97+
9798
This field allow to configure which fields trigger the version increment so to limit
9899
the scope of the concurrency checks.
99100

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,CONCURRENCY,LOCALFOLDER
1717
max-complexity = 12
1818
max-line-length = 160
1919
exclude = .tox,migrations,.git,docs,diff_match_patch.py, deploy/**,settings
20-
ignore = E501,E401,W391,E128,E261,D
20+
ignore = E501,E401,W391,E128,E261,E731
2121

2222
[aliases]
2323
test=pytest

src/concurrency/fields.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ def _do_update(model_instance, base_qs, using, pk_val, values, update_fields, fo
175175

176176
for i, (field, _1, value) in enumerate(values):
177177
if field == version_field:
178-
if model_instance._concurrencymeta.increment and not\
179-
getattr(model_instance, '_concurrency_disable_increment', False):
178+
if (model_instance._concurrencymeta.increment and not
179+
getattr(model_instance, '_concurrency_disable_increment', False)):
180180
new_version = field._get_next_version(model_instance)
181181
values[i] = (field, _1, new_version)
182182
field._set_version_value(model_instance, new_version)
@@ -334,8 +334,8 @@ def _get_hash(self, instance):
334334
ignore_fields = instance._concurrencymeta.ignore_fields
335335

336336
if check_fields is None:
337-
fields= sorted([f.name for f in instance._meta.get_fields()
338-
if f.name not in ignore_fields])
337+
fields = sorted([f.name for f in instance._meta.get_fields()
338+
if f.name not in ignore_fields])
339339
else:
340340
fields = instance._concurrencymeta.check_fields
341341

@@ -355,4 +355,3 @@ def _get_next_version(self, model_instance):
355355
return int(getattr(model_instance, self.attname, 0) + 1)
356356

357357
return int(getattr(model_instance, self.attname, 0))
358-

tests/conftest.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,19 @@
1313
def pytest_configure():
1414
from django.contrib.auth.models import Group
1515
from django.conf import settings
16+
1617
settings.SILENCED_SYSTEM_CHECKS = ['concurrency.W001']
1718
if django.VERSION[:2] == (1.6):
1819
from concurrency.api import apply_concurrency_check
1920
from concurrency.fields import IntegerVersionField
21+
2022
apply_concurrency_check(Group, 'version', IntegerVersionField)
2123

2224

2325
@pytest.fixture(scope='session')
2426
def client(request):
2527
import django_webtest
28+
2629
wtm = django_webtest.WebTestMixin()
2730
wtm.csrf_checks = False
2831
wtm._patch_settings()

tests/test_enable_disable.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ def test_disable_concurrency_instance(model_class=SimpleConcurrentModel):
6464
instance2.save()
6565

6666

67-
6867
@pytest.mark.django_db(transaction=False)
6968
def test_disable_increment():
7069
instance1 = AutoIncConcurrentModel(username=next(nextname))

0 commit comments

Comments
 (0)