[Python-modules-commits] [django-cors-headers] 02/03: merge patched into master

[Brian May]

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

bam pushed a commit to branch master
in repository django-cors-headers.

commit 3ac8a356b8cd2146090f2962d3b887856a0a49c9
Merge: 943918f 09adb1d
Author: Brian May <bam at debian.org>
Date:   Fri Feb 10 17:14:51 2017 +1100

    merge patched into master

 corsheaders/middleware.py                        |  9 +++--
 debian/.git-dpm                                  |  4 +--
 debian/patches/0002-Fix-Django-1.0-support.patch | 45 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 4 files changed, 55 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 55f1e2c,0000000..75e9863
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- c070b3aa4cb30c9c49c5f5d4498b5d847eb06c35
- c070b3aa4cb30c9c49c5f5d4498b5d847eb06c35
++09adb1de0a7b0d99121d135e0a0019f11145fb31
++09adb1de0a7b0d99121d135e0a0019f11145fb31
 +1f50c6e016dd93030cfe96fdb5ea87157ec3f018
 +1f50c6e016dd93030cfe96fdb5ea87157ec3f018
 +django-cors-headers_1.1.0.orig.tar.gz
 +72b55a3728819f4efc2cd8623499eecae8871e50
 +4633
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Fix-Django-1.0-support.patch
index 0000000,0000000..c756797
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fix-Django-1.0-support.patch
@@@ -1,0 -1,0 +1,45 @@@
++From 09adb1de0a7b0d99121d135e0a0019f11145fb31 Mon Sep 17 00:00:00 2001
++From: Brian May <bam at debian.org>
++Date: Fri, 10 Feb 2017 17:14:03 +1100
++Subject: Fix Django 1.0 support
++
++Patch downloaded from upstream
++https://github.com/ottoyiu/django-cors-headers/commit/870b1d9deb54ff4c1fefedc39dff02519abb32c5
++---
++ corsheaders/middleware.py | 9 +++++++--
++ 1 file changed, 7 insertions(+), 2 deletions(-)
++
++diff --git a/corsheaders/middleware.py b/corsheaders/middleware.py
++index f22ee58..c6c1af8 100755
++--- a/corsheaders/middleware.py
+++++ b/corsheaders/middleware.py
++@@ -12,6 +12,11 @@ try:
++ except ImportError:
++     from django.db.models.loading import get_model
++ 
+++try:
+++    from django.utils.deprecation import MiddlewareMixin
+++except ImportError:
+++    MiddlewareMixin = object
+++
++ from corsheaders import defaults as settings
++ 
++ 
++@@ -23,7 +28,7 @@ ACCESS_CONTROL_ALLOW_METHODS = 'Access-Control-Allow-Methods'
++ ACCESS_CONTROL_MAX_AGE = 'Access-Control-Max-Age'
++ 
++ 
++-class CorsPostCsrfMiddleware(object):
+++class CorsPostCsrfMiddleware(MiddlewareMixin):
++ 
++     def _https_referer_replace_reverse(self, request):
++         """
++@@ -45,7 +50,7 @@ class CorsPostCsrfMiddleware(object):
++         return None
++ 
++ 
++-class CorsMiddleware(object):
+++class CorsMiddleware(MiddlewareMixin):
++ 
++     def _https_referer_replace(self, request):
++         """
diff --cc debian/patches/series
index 8987bd5,0000000..e532114
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +disable_broken_tests.patch
++0002-Fix-Django-1.0-support.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-cors-headers.git