Update things to work and test with Django 1.10a

Author: macro1

simple_history/admin.py

@@ -75,8 +75,7 @@ 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)
+        return render(request, self.object_history_template, context)
 
     def response_change(self, request, obj):
         if '_change_history' in request.POST and SIMPLE_HISTORY_EDIT:
@@ -178,8 +177,7 @@ 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)
+        return render(request, self.object_history_form_template, context)
 
     def save_model(self, request, obj, form, change):
         """Set special model attribute to user for reference after save"""

simple_history/management/commands/populate_history.py

@@ -27,22 +27,24 @@ 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(
+    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['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/tests/tests/test_admin.py

@@ -427,8 +427,7 @@ def test_history_form_view_without_getting_history(self):
         }
 
         mock_render.assert_called_once_with(
-            request, template_name=admin.object_history_form_template,
-            dictionary=context, current_app=admin_site.name)
+            request, admin.object_history_form_template, context)
 
     def test_history_form_view_getting_history(self):
         request = RequestFactory().post('/')
@@ -484,8 +483,7 @@ def test_history_form_view_getting_history(self):
         }
 
         mock_render.assert_called_once_with(
-            request, template_name=admin.object_history_form_template,
-            dictionary=context, current_app=admin_site.name)
+            request, admin.object_history_form_template, context)
 
     def test_history_form_view_getting_history_with_setting_off(self):
         request = RequestFactory().post('/')
@@ -540,5 +538,4 @@ def test_history_form_view_getting_history_with_setting_off(self):
         }
 
         mock_render.assert_called_once_with(
-            request, template_name=admin.object_history_form_template,
-            dictionary=context, current_app=admin_site.name)
+            request, admin.object_history_form_template, context)

tox.ini

@@ -4,6 +4,7 @@ envlist =
     py{27,33,34}-django17,
     py{27,33,34,35}-django18,
     py{27,34,35}-django19,
+    py{27,34,35}-django110,
     py{27,34,35}-djangotrunk,
     docs, flake8
 
@@ -34,4 +35,6 @@ deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     djangotrunk: https://github.com/django/django/tarball/master
-commands = coverage run -a --branch setup.py test
+commands =
+    django110: pip install Django>=1.10a,<1.11 --pre
+    coverage run -a --branch setup.py test