Projet

Général

Profil

0001-misc-fix-pep8-error-in-migrate-command.patch

Josué Kouka, 14 mars 2018 18:36

Télécharger (2,55 ko)

Voir les différences: 

Subject: [PATCH 1/2] misc: fix pep8 error in migrate command


 mandayejs/mandaye/management/commands/migrate-users.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
mandayejs/mandaye/management/commands/migrate-users.py
1 1 
from __future__ import absolute_import
2 2 

  		




  3
  
  
    
import os

  		




  4
  3
  
    
import csv

  		




  5
  4
  
    
import json

  		




  6
  5
  
    
import ldif

  		




  7
  6
  
    
import logging

  		




  8
  7
  
    
from optparse import make_option

  		




  9
  8
  
    

  		




  10
  
  
    
from django.core.management.base import BaseCommand, CommandError

  		




  
  9
  
    
from django.core.management.base import BaseCommand

  		




  11
  10
  
    
from django.db import IntegrityError

  		




  12
  11
  
    
from django.contrib.auth.models import User

  		




  13
  12
  
    
from django.core.exceptions import ImproperlyConfigured

  		




  ......




  33
  32
  
    
    args = '<filename>'

  		




  34
  33
  
    
    help = 'Migrate users from ldif file or csv file'

  		




  35
  34
  
    

  		




  36
  
  
    
    option_list = BaseCommand.option_list +(

  		




  
  35
  
    
    option_list = BaseCommand.option_list + (

  		




  37
  36
  
    
        make_option(

  		




  38
  37
  
    
            '--ldap',

  		




  39
  38
  
    
            action='store_true',

  		




  ......




  60
  59
  
    
        else:

  		




  61
  60
  
    
            for filename in args:

  		




  62
  61
  
    
                data = self.get_ldif_data(filename)

  		




  63
  
  
    
                data = [ d[1] for d in data]

  		




  
  62
  
    
                data = [d[1] for d in data]

  		




  64
  63
  
    
                data = [

  		




  65
  
  
    
                    { k : ''.join(v) for k,v in d.items()} for d in data

  		




  
  64
  
    
                    {k: ''.join(v) for k, v in d.items()} for d in data

  		




  66
  65
  
    
                ]

  		




  67
  66
  
    
                self.migrate(data)

  		




  68
  67
  
    

  		




  ......




  76
  75
  
    
            reader = csv.DictReader(fd, delimiter=';', quotechar='|', fieldnames=fieldnames)

  		




  77
  76
  
    
            return list(reader)

  		




  78
  77
  
    

  		




  79
  
  
    

  		




  80
  78
  
    
    def migrate(self, parsed_data):

  		




  81
  79
  
    
        issuer = get_issuer()

  		




  82
  80
  
    

  		




  ......




  85
  83
  
    
                name_id = data.get('idpUniqueID')

  		




  86
  84
  
    
                credentials = json.loads(data.get('spPostValues'))

  		




  87
  85
  
    

  		




  88
  
  
    
                user, created = User.objects.get_or_create(username=name_id,

  		




  89
  
  
    
                        last_name=data.get('spLogin', ''))

  		




  
  86
  
    
                user, created = User.objects.get_or_create(

  		




  
  87
  
    
                    username=name_id, last_name=data.get('spLogin', ''))

  		




  90
  88
  
    

  		




  91
  89
  
    
                uc = UserCredentials(user=user, locators=credentials)

  		




  92
  90
  
    
                uc.save()

  		




  93
  
  
    
-