[Python-modules-commits] [celery-haystack] 03/10: Django 1.9 support.

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository celery-haystack.

commit 46d0f215dbb1f79fb6de0f6568c3fa3f4203b0e0
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Dec 25 15:03:38 2015 +0100

    Django 1.9 support.
    
    Origin: https://github.com/django-haystack/celery-haystack/pull/51
---
 celery_haystack/tasks.py | 6 +++++-
 celery_haystack/utils.py | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/celery_haystack/tasks.py b/celery_haystack/tasks.py
index 34fac4e..808c392 100644
--- a/celery_haystack/tasks.py
+++ b/celery_haystack/tasks.py
@@ -1,6 +1,10 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.core.management import call_command
-from django.db.models.loading import get_model
+try:
+    from django.apps import apps
+    get_model = apps.get_model
+except ImportError:
+    from django.db.models.loading import get_model
 
 from .conf import settings
 
diff --git a/celery_haystack/utils.py b/celery_haystack/utils.py
index e351b2e..75a3b6b 100644
--- a/celery_haystack/utils.py
+++ b/celery_haystack/utils.py
@@ -1,5 +1,8 @@
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.importlib import import_module
+try:
+    from importlib import import_module
+except ImportError:
+    from django.utils.importlib import import_module
 from django.db import connection
 
 from haystack.utils import get_identifier

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/celery-haystack.git