[Python-modules-commits] [django-cors-headers] 04/06: Remove patches after import of latest upstream

[Brian May]

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

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

commit 8d48a93d6d87290b5bf002c8de6ff356b6f7a2da
Author: Brian May <bam at debian.org>
Date:   Wed Jul 5 17:44:42 2017 +1000

    Remove patches after import of latest upstream
---
 debian/patches/0002-Fix-Django-1.0-support.patch | 44 ------------------------
 debian/patches/disable_broken_tests.patch        | 29 ----------------
 debian/patches/series                            |  2 --
 3 files changed, 75 deletions(-)

diff --git a/debian/patches/0002-Fix-Django-1.0-support.patch b/debian/patches/0002-Fix-Django-1.0-support.patch
deleted file mode 100644
index 59e0d54..0000000
--- a/debian/patches/0002-Fix-Django-1.0-support.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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 --git a/debian/patches/disable_broken_tests.patch b/debian/patches/disable_broken_tests.patch
deleted file mode 100644
index 013b11b..0000000
--- a/debian/patches/disable_broken_tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
-Date: Thu, 8 Oct 2015 08:51:17 -0700
-Subject: disable_broken_tests
-
-Patch-Name: disable_broken_tests.patch
----
- corsheaders/tests.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/corsheaders/tests.py b/corsheaders/tests.py
-index 6ebf2ac..6e40b27 100644
---- a/corsheaders/tests.py
-+++ b/corsheaders/tests.py
-@@ -10,6 +10,7 @@ from corsheaders.middleware import ACCESS_CONTROL_MAX_AGE
- from corsheaders import defaults as settings
- from mock import Mock
- from mock import patch
-+import unittest
- 
- 
- class settings_override(object):
-@@ -322,6 +323,7 @@ class TestCorsMiddlewareProcessResponse(TestCase):
-         processed = self.middleware.process_response(request, response)
-         self.assertEqual(processed.get(ACCESS_CONTROL_ALLOW_ORIGIN, None), None)
- 
-+    @unittest.skip("broken test")
-     def test_process_response_when_custom_model_enabled(self, settings):
-         from corsheaders.models import CorsModel
-         CorsModel.objects.create(cors='foo.google.com')
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e532114..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-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