some code clean, removes old compatibility related code

Author: saxix

src/concurrency/compat.py

@@ -1,12 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, unicode_literals
 
+# from django.core.urlresolvers import get_callable
+# from django.db.transaction import atomic
+
 try:
     from django.template.base import TemplateDoesNotExist
 except ImportError:
     from django.template.exceptions import TemplateDoesNotExist  # noqa - django 1.9
-
-try:
-    from django.db.transaction import atomic
-except ImportError:
-    from django.db.transaction import commit_on_success as atomic  # noqa

src/concurrency/config.py

@@ -1,14 +1,11 @@
+# coding=utf-8
 from __future__ import absolute_import, unicode_literals
 
 from django.core.exceptions import ImproperlyConfigured
 from django.test.signals import setting_changed
+from django.urls import get_callable
 from django.utils import six
 
-try:
-    from django.urls.utils import get_callable
-except ImportError:
-    from django.core.urlresolvers import get_callable
-
 # List Editable Policy
 # 0 do not save updated records, save others, show message to the user
 # 1 abort whole transaction

src/concurrency/core.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 from __future__ import absolute_import, unicode_literals
 
 import logging

src/concurrency/fields.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 from __future__ import absolute_import, unicode_literals
 
 import copy
@@ -11,6 +12,7 @@
 from django.db import models
 from django.db.models import signals
 from django.db.models.fields import Field
+from django.db.models.signals import class_prepared, post_migrate
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 
@@ -20,18 +22,6 @@
 from concurrency.core import ConcurrencyOptions
 from concurrency.utils import fqn, refetch
 
-try:
-    from django.apps import apps
-
-    get_model = apps.get_model
-except ImportError:
-    from django.db.models.loading import get_model
-
-try:
-    from django.db.models.signals import class_prepared, post_migrate
-except:
-    from django.db.models.signals import class_prepared, post_syncdb as post_migrate
-
 logger = logging.getLogger(__name__)
 
 OFFSET = int(time.mktime((2000, 1, 1, 0, 0, 0, 0, 0, 0)))
@@ -109,14 +99,6 @@ def __init__(self, *args, **kwargs):
                                            db_tablespace=db_tablespace,
                                            db_column=db_column)
 
-    def deconstruct(self):
-        name, path, args, kwargs = super(VersionField, self).deconstruct()
-        kwargs['default'] = 1
-        return name, path, args, kwargs
-
-    def get_default(self):
-        return 0
-
     def get_internal_type(self):
         return "BigIntegerField"
 
@@ -131,8 +113,8 @@ def formfield(self, **kwargs):
         kwargs['widget'] = forms.VersionField.widget
         return super(VersionField, self).formfield(**kwargs)
 
-    def contribute_to_class(self, cls, name, virtual_only=False):
-        super(VersionField, self).contribute_to_class(cls, name, virtual_only)
+    def contribute_to_class(self, cls, *args, **kwargs):
+        super(VersionField, self).contribute_to_class(cls, *args, **kwargs)
         if hasattr(cls, '_concurrencymeta') or cls._meta.abstract:
             return
         setattr(cls, '_concurrencymeta', ConcurrencyOptions())
@@ -250,8 +232,8 @@ def __init__(self, *args, **kwargs):
         self._trigger_exists = False
         super(TriggerVersionField, self).__init__(*args, **kwargs)
 
-    def contribute_to_class(self, cls, name, virtual_only=False):
-        super(TriggerVersionField, self).contribute_to_class(cls, name)
+    def contribute_to_class(self, cls, *args, **kwargs):
+        super(TriggerVersionField, self).contribute_to_class(cls, *args, **kwargs)
         if not cls._meta.abstract or cls._meta.proxy:
             if self not in _TRIGGERS:
                 _TRIGGERS.append(self)
@@ -332,8 +314,8 @@ def filter_fields(instance, field):
 
 
 class ConditionalVersionField(AutoIncVersionField):
-    def contribute_to_class(self, cls, name, virtual_only=False):
-        super(ConditionalVersionField, self).contribute_to_class(cls, name, virtual_only)
+    def contribute_to_class(self, cls, *args, **kwargs):
+        super(ConditionalVersionField, self).contribute_to_class(cls, *args, **kwargs)
         signals.post_init.connect(self._load_model,
                                   sender=cls,
                                   dispatch_uid=fqn(cls))

src/concurrency/forms.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 from __future__ import absolute_import, unicode_literals
 
 from importlib import import_module

src/concurrency/management/commands/triggers.py

@@ -2,8 +2,8 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.core.management.base import BaseCommand
 from django.db import connections
+from django.db.transaction import atomic
 
-from concurrency.compat import atomic
 from concurrency.triggers import create_triggers, drop_triggers, get_triggers
 
 

src/concurrency/triggers.py

@@ -3,11 +3,10 @@
 
 from collections import defaultdict
 
+from django.apps import apps
 from django.db import connections, router
 from django.db.utils import DatabaseError
 
-from concurrency.fields import _TRIGGERS, get_model  # noqa
-
 
 def get_trigger_name(field):
     """
@@ -39,7 +38,7 @@ def drop_triggers(*databases):
     global _TRIGGERS
     ret = defaultdict(lambda: [])
     for app_label, model_name in _TRIGGERS:
-        model = get_model(app_label, model_name)
+        model = apps.get_model(app_label, model_name)
         field = model._concurrencymeta.field
         alias = router.db_for_write(model)
         if alias in databases:
@@ -56,7 +55,7 @@ def create_triggers(databases):
     ret = defaultdict(lambda: [])
 
     for app_label, model_name in _TRIGGERS:
-        model = get_model(app_label, model_name)
+        model = apps.get_model(app_label, model_name)
         field = model._concurrencymeta.field
         storage = model._concurrencymeta.triggers
         alias = router.db_for_write(model)

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist = py{27}-d{18,19,110,111}-{pg,sqlite,mysql},
-          py{34,35,36}-d{18,19,110,111}-{pg,sqlite, mysql}
+          py{34,35,36}-d{18,19,110,111}-{pg,sqlite,mysql}
           pypy-d{18,19,110,111}-{pg,sqlite}
 
 [pytest]