Merge pull request #259 from treyhunner/django110

Add Django 1.10 support

Author: macro1

.travis.yml

@@ -13,6 +13,7 @@ env:
   - DJANGO="Django>=1.7,<1.8"
   - DJANGO="Django>=1.8,<1.9"
   - DJANGO="Django>=1.9,<1.10"
+  - DJANGO="Django>=1.10,<1.11"
 
 install:
   - pip install -U coverage codecov
@@ -31,5 +32,7 @@ matrix:
      env: DJANGO="Django>=1.7,<1.8"
    - python: 3.3
      env: DJANGO="Django>=1.9,<1.10"
+   - python: 3.3
+     env: DJANGO="Django>=1.10,<1.11"
 
 after_success: codecov

runtests.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import logging
+from os import listdir, unlink
 from os.path import abspath, dirname, join
 from shutil import rmtree
 import sys
@@ -16,7 +17,7 @@
     'simple_history.tests',
     'simple_history.tests.custom_user',
     'simple_history.tests.external',
-    'simple_history.tests.migration_test_app',
+    'simple_history.registry_tests.migration_test_app',
 
     'simple_history',
 
@@ -50,6 +51,7 @@
 
 
 def main():
+
     if not settings.configured:
         settings.configure(**DEFAULT_SETTINGS)
     if hasattr(django, 'setup'):
@@ -59,9 +61,10 @@ def main():
     except ImportError:
         from django.test.simple import DjangoTestSuiteRunner
         failures = DjangoTestSuiteRunner(failfast=False).run_tests(['tests'])
+        failures |= DjangoTestSuiteRunner(failfast=False).run_tests(['registry_tests'])
     else:
-        failures = DiscoverRunner(failfast=False).run_tests(
-            ['simple_history.tests'])
+        failures = DiscoverRunner(failfast=False).run_tests(['simple_history.tests'])
+        failures |= DiscoverRunner(failfast=False).run_tests(['simple_history.registry_tests'])
     sys.exit(failures)
 
 

setup.py

@@ -4,7 +4,7 @@
 tests_require = [
     'Django>=1.4', 'WebTest==2.0.18', 'django-webtest==1.7.8', 'mock==1.0.1']
 try:
-    from unittest import skipUnless
+    from unittest import skipUnless  # noqa
 except ImportError:  # Python 2.6 compatibility
     tests_require.append("unittest2")
 

simple_history/admin.py

@@ -18,6 +18,11 @@
     from django.contrib.admin.utils import unquote
 except ImportError:  # Django < 1.7
     from django.contrib.admin.util import unquote
+try:
+    from django.utils.version import get_complete_version
+except ImportError:
+    from django import VERSION
+    get_complete_version = lambda: VERSION
 
 USER_NATURAL_KEY = tuple(
     key.lower() for key in settings.AUTH_USER_MODEL.split('.', 1))
@@ -75,8 +80,10 @@ def history_view(self, request, object_id, extra_context=None):
             'admin_user_view': admin_user_view
         }
         context.update(extra_context or {})
-        return render(request, template_name=self.object_history_template,
-                      dictionary=context, current_app=request.current_app)
+        extra_kwargs = {}
+        if get_complete_version() < (1, 8):
+            extra_kwargs['current_app'] = request.current_app
+        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:
@@ -178,8 +185,10 @@ def history_form_view(self, request, object_id, version_id):
             'save_on_top': self.save_on_top,
             'root_path': getattr(self.admin_site, 'root_path', None),
         }
-        return render(request, template_name=self.object_history_form_template,
-                      dictionary=context, current_app=request.current_app)
+        extra_kwargs = {}
+        if get_complete_version() < (1, 8):
+            extra_kwargs['current_app'] = request.current_app
+        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/exceptions.py

@@ -2,6 +2,7 @@
 django-simple-history exceptions and warnings classes.
 """
 
+
 class MultipleRegistrationsError(Exception):
     """The model has been registered to have history tracking more than once"""
     pass

simple_history/management/commands/populate_history.py

@@ -27,22 +27,29 @@ class Command(BaseCommand):
     EXISTING_HISTORY_FOUND = "Existing history found, skipping model"
     INVALID_MODEL_ARG = "An invalid model was specified"
 
-    option_list = BaseCommand.option_list + (
-        make_option(
+    if hasattr(BaseCommand, 'option_list'):  # Django < 1.8
+        option_list = BaseCommand.option_list + (
+            make_option('--auto', action='store_true', dest='auto', default=False),
+        )
+
+    def add_arguments(self, parser):
+        super(Command, self).add_arguments(parser)
+        parser.add_argument('models', nargs='*', type=str)
+        parser.add_argument(
             '--auto',
             action='store_true',
             dest='auto',
             default=False,
-            help="Automatically search for models with the "
-                 "HistoricalRecords field type",
-        ),
-    )
+            help='Automatically search for models with the '
+                 'HistoricalRecords field type',
+        )
 
     def handle(self, *args, **options):
         to_process = set()
+        model_strings = options.get('models', []) or args
 
-        if args:
-            for model_pair in self._handle_model_list(*args):
+        if model_strings:
+            for model_pair in self._handle_model_list(*model_strings):
                 to_process.add(model_pair)
 
         elif options['auto']:

simple_history/middleware.py

@@ -1,7 +1,12 @@
 from . models import HistoricalRecords
 
+try:
+    from django.utils.deprecation import MiddlewareMixin as MiddlewareBase
+except ImportError:  # Django < 1.10
+    MiddlewareBase = object
 
-class HistoryRequestMiddleware(object):
+
+class HistoryRequestMiddleware(MiddlewareBase):
     """Expose request to HistoricalRecords.
 
     This middleware sets request as a local thread variable, making it

simple_history/models.py

@@ -78,13 +78,15 @@ def finalize(self, sender, **kwargs):
             pass
         else:
             if hint_class is not sender:  # set in concrete
-                if not (self.inherit and issubclass(sender, hint_class)):  # set in abstract
-                    return
+                if not (self.inherit and issubclass(sender, hint_class)):
+                    return  # set in abstract
         if hasattr(sender._meta, 'simple_history_manager_attribute'):
-            raise exceptions.MultipleRegistrationsError('{}.{} registered multiple times for history tracking.'.format(
-                sender._meta.app_label,
-                sender._meta.object_name,
-            ))
+            raise exceptions.MultipleRegistrationsError(
+                '{}.{} registered multiple times for history tracking.'.format(
+                    sender._meta.app_label,
+                    sender._meta.object_name,
+                )
+            )
         history_model = self.create_history_model(sender)
         module = importlib.import_module(self.module)
         setattr(module, history_model.__name__, history_model)