[Python-modules-commits] [django-cors-headers] 01/01: Convert from git-dpm to patches unapplied format

[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 e45457c34f2db5992fe4a063871528417b466e27
Author: Brian May <bam at moszumanska.debian.org>
Date:   Wed Jul 5 07:41:49 2017 +0000

    Convert from git-dpm to patches unapplied format
---
 corsheaders/middleware.py |  9 ++-------
 corsheaders/tests.py      |  2 --
 debian/.git-dpm           | 11 -----------
 debian/gbp.conf           |  2 ++
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/corsheaders/middleware.py b/corsheaders/middleware.py
index c6c1af8..f22ee58 100755
--- a/corsheaders/middleware.py
+++ b/corsheaders/middleware.py
@@ -12,11 +12,6 @@ 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
 
 
@@ -28,7 +23,7 @@ ACCESS_CONTROL_ALLOW_METHODS = 'Access-Control-Allow-Methods'
 ACCESS_CONTROL_MAX_AGE = 'Access-Control-Max-Age'
 
 
-class CorsPostCsrfMiddleware(MiddlewareMixin):
+class CorsPostCsrfMiddleware(object):
 
     def _https_referer_replace_reverse(self, request):
         """
@@ -50,7 +45,7 @@ class CorsPostCsrfMiddleware(MiddlewareMixin):
         return None
 
 
-class CorsMiddleware(MiddlewareMixin):
+class CorsMiddleware(object):
 
     def _https_referer_replace(self, request):
         """
diff --git a/corsheaders/tests.py b/corsheaders/tests.py
index 6e40b27..6ebf2ac 100644
--- a/corsheaders/tests.py
+++ b/corsheaders/tests.py
@@ -10,7 +10,6 @@ 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):
@@ -323,7 +322,6 @@ 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/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index 75e9863..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-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 --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..3879982
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=debian/master

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