[Python-modules-commits] [python-django-debug-toolbar] 06/07: Drop django-1.10-compat.patch, applied upstream.

[Andrew Starr-Bochicchio]

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

asb pushed a commit to branch master
in repository python-django-debug-toolbar.

commit ba467f0286dd0d4bb8b2b8eca6df0e61831e2fae
Author: Andrew Starr-Bochicchio <a.starr.b at gmail.com>
Date:   Sun Nov 27 10:26:32 2016 -0500

    Drop django-1.10-compat.patch, applied upstream.
---
 debian/changelog                        |  1 +
 debian/patches/django-1.10-compat.patch | 92 ---------------------------------
 debian/patches/series                   |  1 -
 3 files changed, 1 insertion(+), 93 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a560206..f92cd29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ python-django-debug-toolbar (1:1.6-1) UNRELEASED; urgency=medium
   * Drop sqlparse-downgrade.patch as sqlparse >= 0.2 is
     now in Debian.
   * Depend on python{3}-sqlparse >= 0.2.0 (Closes: #844792). 
+  * Drop django-1.10-compat.patch, applied upstream.
 
  -- Andrew Starr-Bochicchio <a.starr.b at gmail.com>  Sun, 27 Nov 2016 10:23:49 -0500
 
diff --git a/debian/patches/django-1.10-compat.patch b/debian/patches/django-1.10-compat.patch
deleted file mode 100644
index c42f8b9..0000000
--- a/debian/patches/django-1.10-compat.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 388e177eb19a2b51f7663003a1aa509ee56bbb7a Mon Sep 17 00:00:00 2001
-From: Matthias Kestenholz <mk at feinheit.ch>
-Date: Wed, 27 Jul 2016 16:44:46 +0200
-Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=828664
-Subject: [PATCH] Make DebugToolarMiddleware compatible with Django 1.10's
- MIDDLEWARE setting
-
-Fixes #853.
----
- debug_toolbar/middleware.py | 17 +++++++++++++----
- docs/changes.rst            | 17 +++++++++++++++++
- 2 files changed, 30 insertions(+), 4 deletions(-)
-
-Index: python-django-debug-toolbar/debug_toolbar/middleware.py
-===================================================================
---- python-django-debug-toolbar.orig/debug_toolbar/middleware.py	2016-08-20 12:06:55.180481913 -0400
-+++ python-django-debug-toolbar/debug_toolbar/middleware.py	2016-08-20 12:06:55.156481477 -0400
-@@ -10,11 +10,19 @@
- from django.conf import settings
- from django.utils import six
- from django.utils.encoding import force_text
-+from django.utils.functional import cached_property
- from django.utils.module_loading import import_string
- 
- from debug_toolbar import settings as dt_settings
- from debug_toolbar.toolbar import DebugToolbar
- 
-+try:
-+    from django.utils.deprecation import MiddlewareMixin
-+except ImportError:  # Django < 1.10
-+    # Works perfectly for everyone using MIDDLEWARE_CLASSES
-+    MiddlewareMixin = object
-+
-+
- _HTML_TYPES = ('text/html', 'application/xhtml+xml')
- 
- 
-@@ -31,21 +39,22 @@
-     return bool(settings.DEBUG)
- 
- 
--class DebugToolbarMiddleware(object):
-+class DebugToolbarMiddleware(MiddlewareMixin):
-     """
-     Middleware to set up Debug Toolbar on incoming request and render toolbar
-     on outgoing response.
-     """
-     debug_toolbars = {}
- 
--    def __init__(self):
-+    @cached_property
-+    def show_toolbar(self):
-         # If SHOW_TOOLBAR_CALLBACK is a string, which is the recommended
-         # setup, resolve it to the corresponding callable.
-         func_or_path = dt_settings.get_config()['SHOW_TOOLBAR_CALLBACK']
-         if isinstance(func_or_path, six.string_types):
--            self.show_toolbar = import_string(func_or_path)
-+            return import_string(func_or_path)
-         else:
--            self.show_toolbar = func_or_path
-+            return func_or_path
- 
-     def process_request(self, request):
-         # Decide whether the toolbar is active for this request.
-Index: python-django-debug-toolbar/docs/changes.rst
-===================================================================
---- python-django-debug-toolbar.orig/docs/changes.rst	2016-08-20 12:06:55.180481913 -0400
-+++ python-django-debug-toolbar/docs/changes.rst	2016-08-20 12:06:55.156481477 -0400
-@@ -1,6 +1,23 @@
- Change log
- ==========
- 
-+1.6 (upcoming)
-+--------------
-+
-+Removed features
-+~~~~~~~~~~~~~~~~
-+
-+* Support for automatic setup has been removed. Installation now requires
-+  explicit setup. As a result, the ``DEBUG_TOOLBAR_PATCH_SETTINGS`` setting has
-+  also been removed. See the :doc:`installation documentation <installation>`
-+  for details.
-+
-+Bugfixes
-+~~~~~~~~
-+
-+* The ``DebugToolbarMiddleware`` now also supports Django 1.10's ``MIDDLEWARE``
-+  setting.
-+
- 1.5
- ---
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a6dd669..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-django-1.10-compat.patch

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