[Python-modules-commits] [celery-haystack] 04/10: merge patched into master

[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 3aed4efb16572ea411579194d06ebd5bbad85764
Merge: 490c372 46d0f21
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Dec 25 15:04:08 2015 +0100

    merge patched into master

 celery_haystack/tasks.py                     |  6 +++-
 celery_haystack/utils.py                     |  5 +++-
 debian/.git-dpm                              |  4 +--
 debian/patches/0002-Django-1.9-support.patch | 41 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 5 files changed, 53 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index f12046d,0000000..bfb0df1
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- ed5a08bde5bfbf8408f994c5ca0e9e6b3d90849f
- ed5a08bde5bfbf8408f994c5ca0e9e6b3d90849f
++46d0f215dbb1f79fb6de0f6568c3fa3f4203b0e0
++46d0f215dbb1f79fb6de0f6568c3fa3f4203b0e0
 +4cc4716890b59d0e1b764ea7051522ed2f62ff49
 +4cc4716890b59d0e1b764ea7051522ed2f62ff49
 +celery-haystack_0.9.orig.tar.gz
 +f4c1383880755cd691456c6f53cd153053fee13e
 +15478
diff --cc debian/patches/0002-Django-1.9-support.patch
index 0000000,0000000..9ef0461
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Django-1.9-support.patch
@@@ -1,0 -1,0 +1,41 @@@
++From 46d0f215dbb1f79fb6de0f6568c3fa3f4203b0e0 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Fri, 25 Dec 2015 15:03:38 +0100
++Subject: 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
diff --cc debian/patches/series
index d68b539,0000000..c95547f
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Add-the-recommended-minimum-MIDDLEWARE_CLASSES.patch
++0002-Django-1.9-support.patch

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