Merge pull request #366 from treyhunner/fix-flake-8-errors

Fixed linting errors and setup flake8 to run on travis

Author: Ross Mechanic

.travis.yml

@@ -14,10 +14,13 @@ env:
 
 install:
   - pip install -U coverage codecov
+  - pip install -U flake8
   - pip install -U $DJANGO
   - pip freeze
 
-script: coverage run setup.py test
+script:
+  - flake8 simple_history
+  - coverage run setup.py test
 
 matrix:
   exclude:

simple_history/admin.py

@@ -78,7 +78,8 @@ def history_view(self, request, object_id, extra_context=None):
         }
         context.update(extra_context or {})
         extra_kwargs = {}
-        return render(request, self.object_history_template, context, **extra_kwargs)
+        return render(request, self.object_history_template, context,
+                      **extra_kwargs)
 
     def response_change(self, request, obj):
         if '_change_history' in request.POST and SIMPLE_HISTORY_EDIT:
@@ -181,7 +182,8 @@ def history_form_view(self, request, object_id, version_id):
             'root_path': getattr(self.admin_site, 'root_path', None),
         }
         extra_kwargs = {}
-        return render(request, self.object_history_form_template, context, **extra_kwargs)
+        return render(request, self.object_history_form_template, context,
+                      **extra_kwargs)
 
     def save_model(self, request, obj, form, change):
         """Set special model attribute to user for reference after save"""

simple_history/management/commands/_populate_utils.py

@@ -26,4 +26,5 @@ def bulk_history_create(model, history_model, batch_size):
                 for field in instance._meta.fields
             }
         ) for instance in model.objects.all()]
-    history_model.objects.bulk_create(historical_instances, batch_size=batch_size)
+    history_model.objects.bulk_create(historical_instances,
+                                      batch_size=batch_size)

simple_history/management/commands/populate_history.py

@@ -38,7 +38,8 @@ def add_arguments(self, parser):
             dest='batchsize',
             default=200,
             type=int,
-            help='Set a custom batch size when bulk inserting historical records.',
+            help='Set a custom batch size when bulk inserting historical '
+                 'records.',
         )
 
     def handle(self, *args, **options):

simple_history/models.py

@@ -165,8 +165,8 @@ def copy_fields(self, model):
             if isinstance(field, models.ForeignKey):
                 old_field = field
                 field_arguments = {'db_constraint': False}
-                if (getattr(old_field, 'one_to_one', False) or
-                    isinstance(old_field, models.OneToOneField)):
+                if getattr(old_field, 'one_to_one', False) \
+                   or isinstance(old_field, models.OneToOneField):
                     FieldType = models.ForeignKey
                 else:
                     FieldType = type(old_field)
@@ -180,7 +180,7 @@ def copy_fields(self, model):
                 # we need to set the `model` value of the field to a model. We
                 # can use the old_field.model value.
                 if isinstance(old_field.remote_field.model, str) and \
-                    old_field.remote_field.model == 'self':
+                   old_field.remote_field.model == 'self':
                     object_to = old_field.model
                 else:
                     object_to = old_field.remote_field.model
@@ -212,9 +212,14 @@ def revert_url(self):
             """URL for this change in the default admin site."""
             opts = model._meta
             app_label, model_name = opts.app_label, opts.model_name
-            return reverse('%s:%s_%s_simple_history' %
-                    (admin.site.name, app_label, model_name),
-                    args=[getattr(self, opts.pk.attname), self.history_id])
+            return reverse(
+                '%s:%s_%s_simple_history' % (
+                    admin.site.name,
+                    app_label,
+                    model_name
+                ),
+                args=[getattr(self, opts.pk.attname), self.history_id]
+            )
 
         def get_instance(self):
             return model(**{
@@ -235,7 +240,10 @@ def get_instance(self):
                 ('~', _('Changed')),
                 ('-', _('Deleted')),
             )),
-            'history_object': HistoricalObjectDescriptor(model, self.fields_included(model)),
+            'history_object': HistoricalObjectDescriptor(
+                model,
+                self.fields_included(model)
+            ),
             'instance': property(get_instance),
             'instance_type': model,
             'revert_url': revert_url,
@@ -324,7 +332,8 @@ def convert_auto_field(field):
     must be replaced with an IntegerField.
     """
     connection = router.db_for_write(field.model)
-    if settings.DATABASES[connection].get('ENGINE') in ('django_mongodb_engine',):
+    if settings.DATABASES[connection].get('ENGINE') in \
+       ('django_mongodb_engine',):
         # Check if AutoField is string for django-non-rel support
         return models.TextField
     return models.IntegerField

simple_history/registry_tests/tests.py

@@ -3,22 +3,20 @@
 import unittest
 from datetime import datetime, timedelta
 
-import django
+from django.apps import apps
 from django.contrib.auth import get_user_model
 from django.core import management
 from django.test import TestCase
-from simple_history import exceptions, register
 from six.moves import cStringIO as StringIO
 
+from simple_history import exceptions, register
 from ..tests.models import (Choice, InheritTracking1, InheritTracking2,
                             InheritTracking3, InheritTracking4, Poll,
                             Restaurant, TrackedAbstractBaseA,
                             TrackedAbstractBaseB, TrackedWithAbstractBase,
                             TrackedWithConcreteBase, UserAccessorDefault,
                             UserAccessorOverride, Voter)
 
-from django.apps import apps
-
 get_model = apps.get_model
 User = get_user_model()
 today = datetime(2021, 1, 1, 10, 0)

simple_history/templatetags/getattributes.py

@@ -8,4 +8,5 @@ def getattribute(value, arg):
 
     return getattr(value, arg, None)
 
+
 register.filter('getattribute', getattribute)

simple_history/tests/admin.py

@@ -3,7 +3,16 @@
 from django.contrib import admin
 
 from simple_history.admin import SimpleHistoryAdmin
-from .models import Poll, Choice, Person, Book, Document, Paper, Employee, ConcreteExternal
+from .models import (
+    Book,
+    Choice,
+    ConcreteExternal,
+    Document,
+    Employee,
+    Paper,
+    Person,
+    Poll
+)
 
 
 class PersonAdmin(SimpleHistoryAdmin):

simple_history/tests/external/models/model4.py

@@ -10,5 +10,6 @@ class ExternalModel4(models.Model):
     class Meta:
         app_label = 'external'
 
+
 register(ExternalModel4, app='simple_history.tests',
          manager_name='histories')

simple_history/tests/models.py

@@ -62,6 +62,7 @@ class Choice(models.Model):
     choice = models.CharField(max_length=200)
     votes = models.IntegerField()
 
+
 register(Choice)
 
 
@@ -199,6 +200,7 @@ class ConcreteAttr(AbstractBase):
 class ConcreteUtil(AbstractBase):
     pass
 
+
 register(ConcreteUtil, bases=[AbstractBase])
 
 
@@ -225,6 +227,7 @@ class Meta:
 class ExternalModel3(models.Model):
     name = models.CharField(max_length=100)
 
+
 register(ExternalModel3, app='simple_history.tests.external',
          manager_name='histories')