Projet

Général

Profil

0001-factorize-compatibility-layer-36509.patch

Benjamin Dauvergne, 29 septembre 2019 16:23

Télécharger (3,56 ko)

Voir les différences: 

Subject: [PATCH 1/2] factorize compatibility layer (#36509)


 mellon/middleware.py  | 2 +-
 mellon/utils.py       | 5 +----
 mellon/views.py       | 6 +-----
 tests/test_sso_slo.py | 7 ++-----
 tests/test_views.py   | 6 ++----
 5 files changed, 7 insertions(+), 19 deletions(-)
mellon/middleware.py
17 17 

  		




  18
  18
  
    
from django.utils.http import urlencode

  		




  19
  19
  
    
from django.http import HttpResponseRedirect

  		




  20
  
  
    
from django.core.urlresolvers import reverse

  		




  21
  20
  
    

  		




  22
  21
  
    
from . import app_settings, utils

  		




  
  22
  
    
from .compat import reverse

  		




  23
  23
  
    

  		




  24
  24
  
    
PASSIVE_TRIED_COOKIE = 'MELLON_PASSIVE_TRIED'

  		




  25
  25
  
    

  		












  

    
      mellon/utils.py
    
  





  24
  24
  
    

  		




  25
  25
  
    
import django

  		




  26
  26
  
    
from django.contrib import auth

  		




  27
  
  
    
if django.VERSION < (1, 11, 0):

  		




  28
  
  
    
    from django.core.urlresolvers import reverse

  		




  29
  
  
    
else:

  		




  30
  
  
    
    from django.urls import reverse

  		




  31
  27
  
    
from django.template.loader import render_to_string

  		




  32
  28
  
    
from django.utils.timezone import make_aware, now, make_naive, is_aware, get_default_timezone

  		




  33
  29
  
    
from django.conf import settings

  		




  ......




  35
  31
  
    
import lasso

  		




  36
  32
  
    

  		




  37
  33
  
    
from . import app_settings

  		




  
  34
  
    
from .compat import reverse

  		




  38
  35
  
    

  		




  39
  36
  
    

  		




  40
  37
  
    
def create_metadata(request):

  		












  

    
      mellon/views.py
    
  





  24
  24
  
    
import xml.etree.ElementTree as ET

  		




  25
  25
  
    

  		




  26
  26
  
    

  		




  27
  
  
    
import django

  		




  28
  
  
    
if django.VERSION < (1, 11, 0):

  		




  29
  
  
    
    from django.core.urlresolvers import reverse

  		




  30
  
  
    
else:

  		




  31
  
  
    
    from django.urls import reverse

  		




  32
  27
  
    
from django.views.generic import View

  		




  33
  28
  
    
from django.http import HttpResponseBadRequest, HttpResponseRedirect, HttpResponse

  		




  34
  29
  
    
from django.contrib import auth

  		




  ......




  43
  38
  
    
from django.utils.translation import ugettext as _

  		




  44
  39
  
    

  		




  45
  40
  
    
from . import app_settings, utils

  		




  
  41
  
    
from .compat import reverse

  		




  46
  42
  
    

  		




  47
  43
  
    
RETRY_LOGIN_COOKIE = 'MELLON_RETRY_LOGIN'

  		




  48
  44
  
    

  		












  

    
      tests/test_sso_slo.py
    
  





  25
  25
  
    

  		




  26
  26
  
    
from pytest import fixture

  		




  27
  27
  
    

  		




  28
  
  
    
import django

  		




  29
  
  
    
if django.VERSION >= (1, 11, 0):

  		




  30
  
  
    
    from django.urls import reverse

  		




  31
  
  
    
else:

  		




  32
  
  
    
    from django.core.urlresolvers import reverse

  		




  33
  28
  
    
from django.utils import six

  		




  34
  29
  
    
from django.utils.six.moves.urllib import parse as urlparse

  		




  35
  30
  
    
from django.utils.encoding import force_str

  		




  ......




  38
  33
  
    

  		




  39
  34
  
    
from httmock import all_requests, HTTMock, response as mock_response

  		




  40
  35
  
    

  		




  
  36
  
    
from mellon.compat import reverse

  		




  
  37
  
    

  		




  41
  38
  
    
from utils import reset_caplog

  		




  42
  39
  
    

  		




  43
  40
  
    

  		












  

    
      tests/test_views.py
    
  





  25
  25
  
    
from httmock import HTTMock

  		




  26
  26
  
    

  		




  27
  27
  
    
import django

  		




  28
  
  
    
if django.VERSION >= (1, 11, 0):

  		




  29
  
  
    
    from django.urls import reverse

  		




  30
  
  
    
else:

  		




  31
  
  
    
    from django.core.urlresolvers import reverse

  		




  32
  28
  
    
from django.utils.encoding import force_text

  		




  33
  29
  
    
from django.utils.http import urlencode

  		




  34
  30
  
    

  		




  35
  31
  
    
from xml_utils import assert_xml_constraints

  		




  36
  32
  
    

  		




  
  33
  
    
from mellon.compat import reverse

  		




  
  34
  
    

  		




  37
  35
  
    
from utils import error_500, html_response

  		




  38
  36
  
    

  		




  39
  37
  
    
pytestmark = pytest.mark.django_db

  		




  40
  
  
    
-