code clean

Author: saxix

src/concurrency/admin.py

@@ -107,7 +107,7 @@ def response_action(self, request, queryset):  # noqa
                     for x in selected:
                         try:
                             pk, version = x.split(",")
-                        except ValueError:
+                        except ValueError:  # pragma: no cover
                             raise ImproperlyConfigured('`ConcurrencyActionMixin` error.'
                                                        'A tuple with `primary_key, version_number` '
                                                        'expected:  `%s` found' % x)
@@ -255,31 +255,30 @@ class ConcurrentModelAdmin(ConcurrencyActionMixin,
     form = ConcurrentForm
     formfield_overrides = {forms.VersionField: {'widget': VersionWidget}}
 
-    if django.VERSION[:2] >= (1, 11):
-        def check(self, **kwargs):
-            errors = []
-            if self.fields:
-                version_field = self.model._concurrencymeta.field
-                if version_field.name not in self.fields:
-                    errors.append(
-                        Error(
-                            'Missed version field in {} fields definition'.format(self),
-                            hint="Please add '{}' to the 'fields' attribute".format(version_field.name),
-                            obj=None,
-                            id='concurrency.A001',
-                        )
+    def check(self, **kwargs):
+        errors = []
+        if self.fields:
+            version_field = self.model._concurrencymeta.field
+            if version_field.name not in self.fields:
+                errors.append(
+                    Error(
+                        'Missed version field in {} fields definition'.format(self),
+                        hint="Please add '{}' to the 'fields' attribute".format(version_field.name),
+                        obj=None,
+                        id='concurrency.A001',
                     )
-            if self.fieldsets:
-                version_field = self.model._concurrencymeta.field
-                fields = flatten([v['fields'] for k, v in self.fieldsets])
-
-                if version_field.name not in fields:
-                    errors.append(
-                        Error(
-                            'Missed version field in {} fieldsets definition'.format(self),
-                            hint="Please add '{}' to the 'fieldsets' attribute".format(version_field.name),
-                            obj=None,
-                            id='concurrency.A002',
-                        )
+                )
+        if self.fieldsets:
+            version_field = self.model._concurrencymeta.field
+            fields = flatten([v['fields'] for k, v in self.fieldsets])
+
+            if version_field.name not in fields:
+                errors.append(
+                    Error(
+                        'Missed version field in {} fieldsets definition'.format(self),
+                        hint="Please add '{}' to the 'fieldsets' attribute".format(version_field.name),
+                        obj=None,
+                        id='concurrency.A002',
                     )
-            return errors
+                )
+        return errors

src/concurrency/compat.py

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

src/concurrency/forms.py

@@ -78,7 +78,7 @@ def get_signer():
         raise ImproperlyConfigured('Error loading concurrency signer %s: "%s"' % (module, e))
     try:
         signer_class = getattr(mod, attr)
-    except AttributeError:
+    except AttributeError:  # pragma: no cover
         raise ImproperlyConfigured('Module "%s" does not define a valid signer named "%s"' % (module, attr))
     return signer_class()
 

src/concurrency/utils.py

@@ -133,7 +133,7 @@ def get_classname(o):
         target = o.__class__
     try:
         return target.__qualname__
-    except AttributeError:
+    except AttributeError:  # pragma: no cover
         return target.__name__