0001-general-remove-compatibility-with-django-1.11-38616.patch

Frédéric Péters, 18 décembre 2019 11:02

Voir les différences: en ligne côte à côte

Subject: [PATCH] general: remove compatibility with django < 1.11 (#38616)

 debian/control        |  4 ++--
 mellon/compat.py      | 27 ---------------------------
 mellon/middleware.py  |  7 ++++---
 mellon/urls.py        |  3 ---
 mellon/utils.py       |  2 +-
 mellon/views.py       |  4 ++--
 setup.py              |  4 ++--
 tests/test_sso_slo.py |  3 +--
 tests/test_views.py   |  3 +--
 testsettings.py       | 15 +++++++--------
 tox.ini               |  4 +---
 11 files changed, 21 insertions(+), 55 deletions(-)
 delete mode 100644 mellon/compat.py

     Architecture: all
     Depends: ${misc:Depends}, ${python:Depends},
         python (>= 2.7),
         python-django (>= 1.5),
         python-django (>= 1:1.11),
         python-isodate,
         python-lasso,
         python-atomicwrites
-...
     Package: python3-django-mellon
     Architecture: all
     Depends: ${misc:Depends}, ${python:Depends},
         python3-django (>= 1.5),
         python3-django (>= 1:1.11),
         python3-isodate,
         python3-lasso,
         python3-atomicwrites

     # django-mellon - SAML2 authentication for Django
     # Copyright (C) 2014-2019 Entr'ouvert
     # This program is free software: you can redistribute it and/or modify
     # it under the terms of the GNU Affero General Public License as
     # published by the Free Software Foundation, either version 3 of the
     # License, or (at your option) any later version.
     # This program is distributed in the hope that it will be useful,
     # but WITHOUT ANY WARRANTY; without even the implied warranty of
     # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     # GNU Affero General Public License for more details.
     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import django
     if django.VERSION < (1, 11, 0):
         from django.core.urlresolvers import reverse
         MiddlewareClass = object
         is_authenticated = lambda user: user.is_authenticated()
     else:
         from django.urls import reverse
         from django.utils.deprecation import MiddlewareMixin
         MiddlewareClass = MiddlewareMixin
         is_authenticated = lambda user: user.is_authenticated

     from django.utils.http import urlencode
     from django.http import HttpResponseRedirect
     from django.utils.deprecation import MiddlewareMixin
     from django.urls import reverse
     from . import app_settings, utils
     from .compat import reverse, MiddlewareClass, is_authenticated
     PASSIVE_TRIED_COOKIE = 'MELLON_PASSIVE_TRIED'
     class PassiveAuthenticationMiddleware(MiddlewareClass):
     class PassiveAuthenticationMiddleware(MiddlewareMixin):
         def process_response(self, request, response):
             # When unlogged remove the PASSIVE_TRIED cookie
             if app_settings.OPENED_SESSION_COOKIE_NAME \
-...
                 return
             if not app_settings.OPENED_SESSION_COOKIE_NAME:
                 return
             if hasattr(request, 'user') and is_authenticated(request.user):
             if hasattr(request, 'user') and request.user.is_authenticated:
                 return
             if PASSIVE_TRIED_COOKIE in request.COOKIES:
                 return

mellon/urls.py
14	14	url('metadata/$', views.metadata,
15	15	name='mellon_metadata')
16	16	]
17		if django.VERSION < (1, 8):
18		from django.conf.urls import patterns
19		urlpatterns = patterns('', *urlpatterns)

     import django
     from django.contrib import auth
     from django.template.loader import render_to_string
     from django.urls import reverse
     from django.utils.timezone import make_aware, now, make_naive, is_aware, get_default_timezone
     from django.conf import settings
     from django.utils.six.moves.urllib.parse import urlparse
     import lasso
     from . import app_settings
     from .compat import reverse
     def create_metadata(request):

     from django.conf import settings
     from django.views.decorators.csrf import csrf_exempt
     from django.shortcuts import render, resolve_url
     from django.urls import reverse
     from django.utils.http import urlencode
     from django.utils import six
     from django.utils.encoding import force_text
-...
     from django.utils.translation import ugettext as _
     from . import app_settings, utils
     from .compat import reverse, is_authenticated
     RETRY_LOGIN_COOKIE = 'MELLON_RETRY_LOGIN'
-...
             next_url = request.GET.get(REDIRECT_FIELD_NAME)
             referer = request.META.get('HTTP_REFERER')
             if not referer or utils.same_origin(referer, request.build_absolute_uri()):
                 if hasattr(request, 'user') and is_authenticated(request.user):
                 if hasattr(request, 'user') and request.user.is_authenticated:
                     logout = None
                     try:
                         issuer = request.session.get('mellon_session', {}).get('issuer')

           include_package_data=True,
           packages=find_packages(),
           install_requires=[
               'django>=1.7,<2.3',
               'django>=1.11,<2.3',
               'requests',
               'isodate',
               'atomicwrites',
           ],
           setup_requires=[
               'django>=1.7,<2',
               'django>=1.10,<2.3',
           ],
           tests_require=[
               'nose>=0.11.4',

     import pytest
     from pytest import fixture
     from django.urls import reverse
     from django.utils import six
     from django.utils.six.moves.urllib import parse as urlparse
     from django.utils.encoding import force_str
-...
     from httmock import all_requests, HTTMock, response as mock_response
     from mellon.compat import reverse
     from utils import reset_caplog

     from httmock import HTTMock
     import django
     from django.urls import reverse
     from django.utils.encoding import force_text
     from django.utils.http import urlencode
     from xml_utils import assert_xml_constraints
     from mellon.compat import reverse
     from utils import error_500, html_response
     pytestmark = pytest.mark.django_db

     TEMPLATE_DIRS = [
         'tests/templates/',
+    ]
     if django.VERSION >= (1, 8):
         TEMPLATES = [
+            {
                 'BACKEND': 'django.template.backends.django.DjangoTemplates',
                 'APP_DIRS': True,
                 'DIRS': TEMPLATE_DIRS,
             },
+        ]
     TEMPLATES = [
+        {
             'BACKEND': 'django.template.backends.django.DjangoTemplates',
             'APP_DIRS': True,
             'DIRS': TEMPLATE_DIRS,
         },
+    ]

     [tox]
     envlist = coverage-py2-{dj18,dj111}-{pg,sqlite},coverage-py3-dj{111,22}-{pg,sqlite}
     envlist = coverage-py2-dj111-{pg,sqlite},coverage-py3-dj{111,22}-{pg,sqlite}
     toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/django-mellon/
     [testenv]
-...
     usedevelop =
         coverage: true
     deps =
       dj18: django>=1.8,<1.9
       dj111: django>=1.11,<1.12
       dj22: django>=2.2,<2.3
       pg: psycopg2
-...
       pytz
       lxml
       cssselect
       dj18: django-webtest<1.9.3
       dj111: django-webtest<1.9.3
       dj22: django-webtest>1.9.3
       WebTest
+    -

Projet

Général

Profil

Produits Entr'ouvert » django-mellon

0001-general-remove-compatibility-with-django-1.11-38616.patch