Projet

Général

Profil

0001-python3-reduce-needs-proper-six-import-32449.patch

Paul Marillonnet, 18 avril 2019 14:35

Télécharger (1,25 ko)

Voir les différences: 

Subject: [PATCH] python3: reduce needs proper six import (#32449)


 src/authentic2/custom_user/managers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
src/authentic2/custom_user/managers.py
1 1 
from django.db import models
2 
from django.utils import timezone
2 
from django.utils import timezone, six
3 3 
from django.contrib.auth.models import BaseUserManager
4 4 

  		




  5
  5
  
    
from authentic2.models import Attribute

  		




  ......




  23
  23
  
    
                q = q | models.query.Q(

  		




  24
  24
  
    
                    attribute_values__content__icontains=term, attribute_values__attribute=a)

  		




  25
  25
  
    
            queries.append(q)

  		




  26
  
  
    
        self = self.filter(reduce(models.query.Q.__and__, queries))

  		




  
  26
  
    
        self = self.filter(six.moves.reduce(models.query.Q.__and__, queries))

  		




  27
  27
  
    
        # search by attributes can match multiple times

  		




  28
  28
  
    
        if searchable_attributes:

  		




  29
  29
  
    
            self = self.distinct()

  		




  30
  
  
    
-