Projet

Général

Profil

0001-python3-use-six.moves.reduce-instead-of-builtin-redu.patch

Paul Marillonnet, 06 mars 2019 20:06

Télécharger (3,71 ko)

Voir les différences: 

Subject: [PATCH] python3: use six.moves.reduce instead of builtin reduce
 (#31165)


 src/authentic2/backends/models_backend.py | 2 +-
 src/authentic2/idp/saml/backend.py        | 1 +
 src/authentic2/manager/utils.py           | 1 +
 src/authentic2/saml/common.py             | 1 +
 src/django_rbac/backends.py               | 1 +
 src/django_rbac/managers.py               | 1 +
 src/django_rbac/models.py                 | 1 +
 7 files changed, 7 insertions(+), 1 deletion(-)
src/authentic2/backends/models_backend.py
19 19 
from django.db import models
20 20 
from django.contrib.auth import get_user_model
21 21 
from django.contrib.auth.backends import ModelBackend
22 
from django.utils import six
22 
from six.moves import reduce
23 23 

  		




  24
  24
  
    
from .. import app_settings

  		




  25
  25
  
    
from authentic2.user_login_failure import user_login_success, user_login_failure

  		












  

    
      src/authentic2/idp/saml/backend.py
    
  





  7
  7
  
    
from django.core.urlresolvers import reverse

  		




  8
  8
  
    
from django.template.loader import render_to_string

  		




  9
  9
  
    
from django.db.models import Q

  		




  
  10
  
    
from six.moves import reduce

  		




  10
  11
  
    

  		




  11
  12
  
    
import authentic2.saml.models as models

  		




  12
  13
  
    
import authentic2.idp.saml.saml2_endpoints as saml2_endpoints

  		












  

    
      src/authentic2/manager/utils.py
    
  





  1
  1
  
    

  		




  2
  2
  
    

  		




  3
  3
  
    
from django_rbac.utils import get_ou_model

  		




  
  4
  
    
from six.moves import reduce

  		




  4
  5
  
    

  		




  5
  6
  
    
from authentic2.decorators import GlobalCache

  		




  6
  7
  
    

  		












  

    
      src/authentic2/saml/common.py
    
  





  8
  8
  
    

  		




  9
  9
  
    
import requests

  		




  10
  10
  
    

  		




  
  11
  
    
from six.moves import reduce

  		




  11
  12
  
    
from authentic2.compat_lasso import lasso

  		




  12
  13
  
    
from django.conf import settings

  		




  13
  14
  
    
from django.http import HttpResponseRedirect, Http404, HttpResponse

  		












  

    
      src/django_rbac/backends.py
    
  





  9
  9
  
    
except ImportError:

  		




  10
  10
  
    
    # Django < 1.8

  		




  11
  11
  
    
    from django.db.models.fields import FieldDoesNotExist

  		




  
  12
  
    
from six.moves import reduce

  		




  12
  13
  
    

  		




  13
  14
  
    
from . import utils

  		




  14
  15
  
    

  		












  

    
      src/django_rbac/managers.py
    
  





  6
  6
  
    
from django.contrib.contenttypes.models import ContentType

  		




  7
  7
  
    
from django.db.models.query import Q, Prefetch

  		




  8
  8
  
    
from django.contrib.auth import get_user_model

  		




  
  9
  
    
from six.moves import reduce

  		




  9
  10
  
    

  		




  10
  11
  
    
from . import utils

  		




  11
  12
  
    

  		












  

    
      src/django_rbac/models.py
    
  





  18
  18
  
    
from django.contrib.auth.models import Group, _user_get_all_permissions, \

  		




  19
  19
  
    
    _user_has_perm, _user_has_module_perms, Permission as AuthPermission

  		




  20
  20
  
    
from django.contrib import auth

  		




  
  21
  
    
from six.moves import reduce

  		




  21
  22
  
    

  		




  22
  23
  
    
from . import utils, constants, managers, backends

  		




  23
  24
  
    

  		




  24
  
  
    
-