Merge pull request #172 from bradford281/django18

update imports for Django 1.8; fixes "django 18 deprecation warnings

AUTHORS.rst

@@ -2,6 +2,7 @@ Authors
 =======
 
 - Aleksey Kladov
+- bradford281
 - Brian Dixon
 - Corey Bertram
 - Damien Nozay

simple_history/admin.py

@@ -7,17 +7,21 @@
 from django.contrib.contenttypes.models import ContentType
 from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404, render
-from django.contrib.admin.util import unquote
 from django.utils.text import capfirst
 from django.utils.html import mark_safe
 from django.utils.translation import ugettext as _
 from django.utils.encoding import force_text
 from django.conf import settings
 
+try:
+    from django.contrib.admin.utils import unquote
+except ImportError:  # Django < 1.7
+    from django.contrib.admin.util import unquote
 try:
     USER_NATURAL_KEY = settings.AUTH_USER_MODEL
 except AttributeError:  # Django < 1.5
     USER_NATURAL_KEY = "auth.User"
+
 USER_NATURAL_KEY = tuple(key.lower() for key in USER_NATURAL_KEY.split('.', 1))
 
 

simple_history/management/commands/populate_history.py

@@ -1,6 +1,13 @@
 from optparse import make_option
+
 from django.core.management.base import BaseCommand, CommandError
-from django.db.models.loading import get_model
+
+try:
+    from django.apps import apps
+except ImportError:  # Django < 1.7
+    from django.db.models.loading import get_model
+else:
+    get_model = apps.get_model
 
 from ... import models
 from . import _populate_utils as utils

simple_history/models.py

@@ -6,23 +6,27 @@
 
 import django
 from django.db import models, router
-from django.db.models import loading
 from django.db.models.fields.proxy import OrderWrt
 from django.db.models.fields.related import RelatedField
 from django.conf import settings
 from django.contrib import admin
-from django.utils import importlib, six
+from django.utils import six
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.encoding import smart_text
 from django.utils.timezone import now
 from django.utils.translation import string_concat
 
-from .manager import HistoryDescriptor
-
+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
 try:
     from south.modelsinspector import add_introspection_rules
 except ImportError:  # south not present
@@ -31,6 +35,8 @@
     add_introspection_rules(
         [], ["^simple_history.models.CustomForeignKeyField"])
 
+from .manager import HistoryDescriptor
+
 registered_models = {}
 
 
@@ -99,7 +105,7 @@ def create_history_model(self, model):
         elif app_module != self.module:
             if apps is None:  # Django < 1.7
                 # has meta options with app_label
-                app = loading.get_app(model._meta.app_label)
+                app = get_app(model._meta.app_label)
                 attrs['__module__'] = app.__name__  # full dotted name
             else:
                 # Abuse an internal API because the app registry is loading.

simple_history/tests/tests/test_admin.py

@@ -1,17 +1,22 @@
 from datetime import datetime, timedelta
+
 from django_webtest import WebTest
 from django.test.utils import override_settings
 from django import VERSION
 from django.core.urlresolvers import reverse
+from django.conf import settings
+
 try:
     from django.contrib.auth import get_user_model
     User = get_user_model()
-except ImportError:  # django 1.4 compatibility
+except ImportError:  # Django < 1.5
     from django.contrib.auth.models import User
-from django.contrib.admin.util import quote
-from django.conf import settings
-from simple_history.models import HistoricalRecords
+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 ..models import Book, Person, Poll, State, Employee