Update for compatability issues

Author: macro1

.editorconfig

@@ -8,6 +8,7 @@ charset = utf-8
 indent_style = space
 end_of_line = lf
 insert_final_newline = true
+max_line_length = 79
 trim_trailing_whitespace = true
 
 [*.{py,rst,ini}]

.travis.yml

@@ -3,7 +3,6 @@ language: python
 sudo: false
 
 python:
-  - 2.6
   - 2.7
   - 3.2
   - 3.3
@@ -13,6 +12,7 @@ env:
   - DJANGO="Django>=1.6,<1.7"
   - DJANGO="Django>=1.7,<1.8"
   - DJANGO="Django>=1.8,<1.9"
+  - DJANGO="Django>=1.9a,<1.10"
 
 install:
   - pip install -U 'coverage<4' codecov $DJANGO
@@ -22,21 +22,25 @@ script: coverage run setup.py test
 
 matrix:
   exclude:
-   - python: 2.6
-     env: DJANGO="Django>=1.6,<1.7"
-   - python: 2.6
-     env: DJANGO="Django>=1.7,<1.8"
-   - python: 2.6
-     env: DJANGO="Django>=1.8,<1.9"
    - python: 3.2
      env: DJANGO="Django>=1.4,<1.5"
    - python: 3.3
      env: DJANGO="Django>=1.4,<1.5"
+   - python: 3.2
+     env: DJANGO="Django>=1.9a,<1.10"
+   - python: 3.3
+     env: DJANGO="Django>=1.9a,<1.10"
 
   include:
+   - python: 2.6
+     env: DJANGO="Django>=1.4,<1.5"
    - python: 3.4
      env: DJANGO="Django>=1.7,<1.8"
    - python: 3.4
      env: DJANGO="Django>=1.8,<1.9"
+   - python: 3.5
+     env: DJANGO="Django>=1.8,<1.9"
+   - python: 3.5
+     env: DJANGO="Django>=1.9a,<1.10"
 
 after_success: codecov

docs/conf.py

@@ -95,7 +95,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+# html_theme = 'default'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

docs/usage.rst

@@ -43,7 +43,7 @@ settings:
     ]
 
 If you do not want to use the middleware, you can explicitly indicate
-the user making the change as documented in :ref:`recording_user`.
+the user making the change as documented in :doc:`/advanced`.
 
 Models
 ~~~~~~
@@ -121,7 +121,7 @@ An example of admin integration for the ``Poll`` and ``Choice`` models:
     admin.site.register(Poll, SimpleHistoryAdmin)
     admin.site.register(Choice, SimpleHistoryAdmin)
 
-Changing a history-tracked model from the admin interface will automatically record the user who made the change (see :ref:`recording_user`).
+Changing a history-tracked model from the admin interface will automatically record the user who made the change (see :doc:`/advanced`).
 
 
 Querying history

runtests.py

@@ -1,15 +1,15 @@
 #!/usr/bin/env python
-import sys
-from shutil import rmtree
+import logging
 from os.path import abspath, dirname, join
+from shutil import rmtree
+import sys
+import warnings
 
 import django
 from django.conf import settings
 
-
 sys.path.insert(0, abspath(dirname(__file__)))
 
-
 media_root = join(abspath(dirname(__file__)), 'test_files')
 rmtree(media_root, ignore_errors=True)
 
@@ -39,6 +39,10 @@
         'django.contrib.auth.middleware.AuthenticationMiddleware',
         'django.contrib.messages.middleware.MessageMiddleware',
     ],
+    TEMPLATES=[{
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'APP_DIRS': True,
+    }],
 )
 
 if django.VERSION >= (1, 5):
@@ -62,4 +66,5 @@ def main():
 
 
 if __name__ == "__main__":
+    logging.basicConfig()
     main()

setup.py

@@ -2,8 +2,7 @@
 import simple_history
 
 tests_require = [
-    "Django>=1.4", "webtest==2.0.6", "django-webtest==1.7", "mock==1.0.1"
-]
+    'Django>=1.4', 'WebTest==2.0.18', 'django-webtest==1.7.8', 'mock==1.0.1']
 try:
     from unittest import skipUnless
 except ImportError:  # Python 2.6 compatibility

simple_history/admin.py

@@ -2,8 +2,9 @@
 
 from django import http
 from django.core.exceptions import PermissionDenied
-from django.conf.urls import patterns, url
-from django.contrib.admin import helpers, ModelAdmin
+from django.conf.urls import url
+from django.contrib import admin
+from django.contrib.admin import helpers
 from django.contrib.contenttypes.models import ContentType
 from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404, render
@@ -27,7 +28,7 @@
 SIMPLE_HISTORY_EDIT = getattr(settings, 'SIMPLE_HISTORY_EDIT', False)
 
 
-class SimpleHistoryAdmin(ModelAdmin):
+class SimpleHistoryAdmin(admin.ModelAdmin):
     object_history_template = "simple_history/object_history.html"
     object_history_form_template = "simple_history/object_history_form.html"
 
@@ -40,16 +41,16 @@ def get_urls(self):
             info = opts.app_label, opts.model_name
         except AttributeError:  # Django < 1.7
             info = opts.app_label, opts.module_name
-        history_urls = patterns(
-            "",
+        history_urls = [
             url("^([^/]+)/history/([^/]+)/$",
                 admin_site.admin_view(self.history_form_view),
                 name='%s_%s_simple_history' % info),
-        )
+        ]
         return history_urls + urls
 
     def history_view(self, request, object_id, extra_context=None):
-        "The 'history' admin view for this model."
+        """The 'history' admin view for this model."""
+        request.current_app = self.admin_site.name
         model = self.model
         opts = model._meta
         app_label = opts.app_label
@@ -81,7 +82,7 @@ def history_view(self, request, object_id, extra_context=None):
         }
         context.update(extra_context or {})
         return render(request, template_name=self.object_history_template,
-                      dictionary=context, current_app=self.admin_site.name)
+                      dictionary=context, current_app=request.current_app)
 
     def response_change(self, request, obj):
         if '_change_history' in request.POST and SIMPLE_HISTORY_EDIT:
@@ -101,6 +102,7 @@ def response_change(self, request, obj):
                 request, obj)
 
     def history_form_view(self, request, object_id, version_id):
+        request.current_app = self.admin_site.name
         original_opts = self.model._meta
         model = getattr(
             self.model,
@@ -120,7 +122,7 @@ def history_form_view(self, request, object_id, version_id):
             change_history = False
 
         if '_change_history' in request.POST and SIMPLE_HISTORY_EDIT:
-            obj = obj.history.get(pk=version_id)
+            obj = obj.history.get(pk=version_id).instance
 
         formsets = []
         form_class = self.get_form(request, obj)
@@ -186,7 +188,7 @@ def history_form_view(self, request, object_id, version_id):
             'root_path': getattr(self.admin_site, 'root_path', None),
         }
         return render(request, template_name=self.object_history_form_template,
-                      dictionary=context, current_app=self.admin_site.name)
+                      dictionary=context, current_app=request.current_app)
 
     def save_model(self, request, obj, form, change):
         """Set special model attribute to user for reference after save"""

simple_history/models.py

@@ -16,17 +16,14 @@
 from django.utils.timezone import now
 from django.utils.translation import string_concat
 
-try:
-    import importlib
-except ImportError:
-    from django.utils import importlib
 try:
     from django.apps import apps
 except ImportError:  # Django < 1.7
-    from django.db.models.loading import get_app
-    apps = None
-else:
-    get_app = apps.get_app
+    from django.db.models import get_app
+try:
+    import importlib
+except ImportError:  # Python < 2.7
+    from django.utils import importlib
 try:
     from south.modelsinspector import add_introspection_rules
 except ImportError:  # south not present
@@ -103,14 +100,14 @@ def create_history_model(self, model):
             # registered under different app
             attrs['__module__'] = self.module
         elif app_module != self.module:
-            if apps is None:  # Django < 1.7
-                # has meta options with app_label
-                app = get_app(model._meta.app_label)
-                attrs['__module__'] = app.__name__  # full dotted name
-            else:
+            try:
                 # Abuse an internal API because the app registry is loading.
                 app = apps.app_configs[model._meta.app_label]
-                attrs['__module__'] = app.name      # full dotted name
+            except NameError:  # Django < 1.7
+                models_module = get_app(model._meta.app_label).__name__
+            else:
+                models_module = app.name
+            attrs['__module__'] = models_module
 
         fields = self.copy_fields(model)
         attrs.update(fields)
@@ -130,7 +127,10 @@ def copy_fields(self, model):
         fields = {}
         for field in model._meta.fields:
             field = copy.copy(field)
-            field.rel = copy.copy(field.rel)
+            try:
+                field.remote_field = copy.copy(field.remote_field)
+            except AttributeError:
+                field.rel = copy.copy(field.rel)
             if isinstance(field, OrderWrt):
                 # OrderWrt is a proxy field, switch to a plain IntegerField
                 field.__class__ = models.IntegerField
@@ -146,7 +146,8 @@ def copy_fields(self, model):
                     field_arguments['db_constraint'] = False
                 if getattr(old_field, 'to_fields', []):
                     field_arguments['to_field'] = old_field.to_fields[0]
-                elif django.get_version() < "1.6" and old_field.rel.field_name != 'id':
+                elif (django.get_version() < "1.6" and
+                      old_field.rel.field_name != 'id'):
                     field_arguments['to_field'] = old_field.rel.field_name
                 if getattr(old_field, 'db_column', None):
                     field_arguments['db_column'] = old_field.db_column

simple_history/templates/simple_history/object_history.html

@@ -1,6 +1,6 @@
 {% extends "admin/object_history.html" %}
 {% load i18n %}
-{% load url from future %}
+{% load url from simple_history_compat %}
 {% load admin_urls %}
 
 

simple_history/templates/simple_history/object_history_form.html

@@ -1,6 +1,6 @@
 {% extends "admin/change_form.html" %}
 {% load i18n %}
-{% load url from future %}
+{% load url from simple_history_compat %}
 
 {% block breadcrumbs %}
   <div class="breadcrumbs">

simple_history/templatetags/__init__.py

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

simple_history/templatetags/simple_history_compat.py

@@ -1,9 +1,8 @@
 from datetime import datetime, timedelta
 
-from mock import patch, MagicMock, PropertyMock, ANY
+from mock import patch, ANY
 from django_webtest import WebTest
 from django.contrib.admin import AdminSite
-from django.contrib.contenttypes.models import ContentType
 from django.contrib.messages.storage.fallback import FallbackStorage
 from django.test.utils import override_settings
 from django.test.client import RequestFactory
@@ -248,9 +247,8 @@ def test_deleteting_user(self):
         self.assertEqual(historical_poll.history_user, None)
 
     def test_missing_one_to_one(self):
-        """
-        A relation to a missing one-to-one model should still show history
-        """
+        """A relation to a missing one-to-one model should still show
+        history"""
         self.login()
         manager = Employee.objects.create()
         employee = Employee.objects.create(manager=manager)
@@ -315,7 +313,8 @@ def test_response_change_change_history_setting_off(self):
         response = admin.response_change(request, poll)
 
         with patch(
-                'simple_history.admin.ModelAdmin.response_change') as m_admin:
+            'simple_history.admin.admin.ModelAdmin.response_change'
+        ) as m_admin:
             m_admin.return_value = 'it was called'
             response = admin.response_change(request, poll)
 
@@ -335,7 +334,8 @@ def test_response_change_no_change_history(self):
         admin = SimpleHistoryAdmin(Poll, admin_site)
 
         with patch(
-                'simple_history.admin.ModelAdmin.response_change') as m_admin:
+            'simple_history.admin.admin.ModelAdmin.response_change'
+        ) as m_admin:
             m_admin.return_value = 'it was called'
             response = admin.response_change(request, poll)
 
@@ -372,7 +372,7 @@ def test_history_form_view_without_getting_history(self):
             'app_label': 'tests',
             'original_opts': ANY,
             'changelist_url': '/admin/tests/poll/',
-            'change_url': '/admin/tests/poll/1/',
+            'change_url': ANY,
             'history_url': '/admin/tests/poll/1/history/',
             'add': False,
             'change': True,
@@ -416,10 +416,10 @@ def test_history_form_view_getting_history(self):
 
         context = {
             # Verify this is set for history object not poll object
-            'original': history,
+            'original': history.instance,
             'change_history': True,
 
-            'title': 'Revert %s' % force_text(history),
+            'title': 'Revert %s' % force_text(history.instance),
             'adminform': ANY,
             'object_id': poll.id,
             'is_popup': False,
@@ -428,8 +428,8 @@ def test_history_form_view_getting_history(self):
             'app_label': 'tests',
             'original_opts': ANY,
             'changelist_url': '/admin/tests/poll/',
-            'change_url': '/admin/tests/poll/2/',
-            'history_url': '/admin/tests/poll/2/history/',
+            'change_url': ANY,
+            'history_url': '/admin/tests/poll/{}/history/'.format(poll.pk),
             'add': False,
             'change': True,
             'has_add_permission': admin.has_add_permission(request),
@@ -484,7 +484,7 @@ def test_history_form_view_getting_history_with_setting_off(self):
             'app_label': 'tests',
             'original_opts': ANY,
             'changelist_url': '/admin/tests/poll/',
-            'change_url': '/admin/tests/poll/1/',
+            'change_url': ANY,
             'history_url': '/admin/tests/poll/1/history/',
             'add': False,
             'change': True,