Update docs, remove unused code

Author: macro1

CHANGES.rst

@@ -4,6 +4,7 @@ Changes
 tip (unreleased)
 ----------------
 - Add Polish locale.
+- Add Django 1.10 support.
 
 1.8.1 (2016-03-19)
 ------------------

docs/usage.rst

@@ -37,7 +37,7 @@ settings:
 
 .. code-block:: python
 
-    MIDDLEWARE_CLASSES = [
+    MIDDLEWARE = [
         # ...
         'simple_history.middleware.HistoryRequestMiddleware',
     ]
@@ -168,5 +168,6 @@ records for all ``Choice`` instances can be queried by using the manager on the
     <simple_history.manager.HistoryManager object at 0x1cc4290>
     >>> Choice.history.all()
     [<HistoricalChoice: Choice object as of 2010-10-25 18:05:12.183340>, <HistoricalChoice: Choice object as of 2010-10-25 18:04:59.047351>]
-    
-Because the history is model, you can also filter it like regulary QuerySets, a.k. Choice.history.filter(choice_text='Not Much') will work!
+
+Because the history is model, you can also filter it like regularly QuerySets,
+a.k. Choice.history.filter(choice_text='Not Much') will work!

runtests.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 import logging
-from os import listdir, unlink
 from os.path import abspath, dirname, join
 from shutil import rmtree
 import sys

setup.py

@@ -2,11 +2,7 @@
 import simple_history
 
 tests_require = [
-    'Django>=1.4', 'WebTest==2.0.18', 'django-webtest==1.7.8', 'mock==1.0.1']
-try:
-    from unittest import skipUnless  # noqa
-except ImportError:  # Python 2.6 compatibility
-    tests_require.append("unittest2")
+    'Django>=1.6', 'WebTest==2.0.24', 'django-webtest==1.8.0', 'mock==1.0.1']
 
 setup(
     name='django-simple-history',
@@ -29,7 +25,6 @@
         "Environment :: Web Environment",
         "Intended Audience :: Developers",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',

simple_history/templatetags/simple_history_compat.py

@@ -1,9 +1,5 @@
 from django import template
-
-try:  # Django < 1.5
-    from django.templatetags.future import url
-except ImportError:
-    from django.template.defaulttags import url
+from django.template.defaulttags import url
 
 register = template.Library()
 

simple_history/tests/models.py

@@ -1,15 +1,11 @@
 from __future__ import unicode_literals
 
-import django
 from django.db import models
 
 from simple_history.models import HistoricalRecords
 from simple_history import register
 
-if django.VERSION >= (1, 5):
-    from .custom_user.models import CustomUser as User
-else:  # django 1.4 compatibility
-    from django.contrib.auth.models import User
+from .custom_user.models import CustomUser as User
 
 
 class Poll(models.Model):

simple_history/tests/tests/test_admin.py

@@ -8,23 +8,19 @@
 from django.test.client import RequestFactory
 from django.core.urlresolvers import reverse
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.utils.encoding import force_text
 
-try:
-    from django.contrib.auth import get_user_model
-    User = get_user_model()
-except ImportError:  # Django < 1.5
-    from django.contrib.auth.models import User
-try:
-    from django.contrib.admin.utils import quote
-except ImportError:  # Django < 1.7
-    from django.contrib.admin.util import quote
-
 from simple_history.models import HistoricalRecords
 from simple_history.admin import SimpleHistoryAdmin, get_complete_version
 from ..models import Book, Person, Poll, State, Employee
 
+try:
+    from django.contrib.admin.utils import quote
+except ImportError:  # Django < 1.7
+    from django.contrib.admin.util import quote
 
+User = get_user_model()
 today = datetime(2021, 1, 1, 10, 0)
 tomorrow = today + timedelta(days=1)
 

simple_history/tests/tests/test_models.py

@@ -5,10 +5,11 @@
 import warnings
 
 import django
+from django.contrib.auth import get_user_model
+from django.core.files.base import ContentFile
 from django.db import models
 from django.db.models.fields.proxy import OrderWrt
 from django.test import TestCase
-from django.core.files.base import ContentFile
 
 from simple_history.models import HistoricalRecords, convert_auto_field
 from ..models import (
@@ -28,16 +29,8 @@
     from django.db.models import get_model
 else:
     get_model = apps.get_model
-try:
-    from unittest import skipUnless
-except ImportError:
-    from unittest2 import skipUnless
-try:
-    from django.contrib.auth import get_user_model
-    User = get_user_model()
-except ImportError:  # django 1.4 compatibility
-    from django.contrib.auth.models import User
 
+User = get_user_model()
 today = datetime(2021, 1, 1, 10, 0)
 tomorrow = today + timedelta(days=1)
 yesterday = today - timedelta(days=1)
@@ -499,7 +492,7 @@ def test_string_related(self):
             related_model = field_object.related.model
         self.assertEqual(related_model, HistoricalState)
 
-    @skipUnless(django.get_version() >= "1.7", "Requires 1.7 migrations")
+    @unittest.skipUnless(django.get_version() >= "1.7", "Requires 1.7 migrations")
     def test_state_serialization_of_customfk(self):
         from django.db.migrations import state
         state.ModelState.from_model(HistoricalCustomFKError)
@@ -651,7 +644,7 @@ def test_restore_object_with_changed_order(self):
         self.assertEqual(order[5], self.w_chair.pk)
         self.assertEqual(order[6], self.w_battle.pk)
 
-    @skipUnless(django.get_version() >= "1.7", "Requires 1.7 migrations")
+    @unittest.skipUnless(django.get_version() >= "1.7", "Requires 1.7 migrations")
     def test_migrations_include_order(self):
         from django.db.migrations import state
         model_state = state.ModelState.from_model(SeriesWork.history.model)