Projet

Général

Profil

0001-python3-use-django.utils.six.BytesIO-31152.patch

Paul Marillonnet, 20 mars 2019 16:51

Télécharger (4,39 ko)

Voir les différences: 

Subject: [PATCH] python3: use django.utils.six.BytesIO (#31152)


 src/authentic2/management/commands/slapd-shell.py        | 4 ++--
 src/authentic2/saml/management/commands/sync-metadata.py | 4 ++--
 tests/test_idp_saml2.py                                  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
src/authentic2/management/commands/slapd-shell.py
2 2 

  		




  3
  3
  
    
import logging

  		




  4
  4
  
    
import sys

  		




  5
  
  
    
from StringIO import StringIO

  		




  6
  5
  
    
import re

  		




  7
  6
  
    

  		




  8
  7
  
    
from ldap.dn import escape_dn_chars

  		




  ......




  11
  10
  
    

  		




  12
  11
  
    
from django.contrib.auth import get_user_model

  		




  13
  12
  
    
from django.core.management.base import BaseCommand

  		




  
  13
  
    
from django.utils import six

  		




  14
  14
  
    
from optparse import make_option

  		




  15
  15
  
    

  		




  16
  16
  
    
COMMAND = 1

  		




  ......




  34
  34
  
    
    def ldap(self, command, attrs):

  		




  35
  35
  
    
        self.logger.debug('received command %s %s', command, attrs)

  		




  36
  36
  
    
        if command == 'SEARCH':

  		




  37
  
  
    
            out = StringIO()

  		




  
  37
  
    
            out = six.BytesIO()

  		




  38
  38
  
    
            ldif_writer = LDIFWriter(out)

  		




  39
  39
  
    
            qs = get_user_model().objects.all()

  		




  40
  40
  
    
            if attrs['filter'] != '(objectClass=*)':

  		












  

    
      src/authentic2/saml/management/commands/sync-metadata.py
    
  





  4
  4
  
    
import xml.etree.ElementTree as etree

  		




  5
  5
  
    
import os

  		




  6
  6
  
    
import requests

  		




  7
  
  
    
from StringIO import StringIO

  		




  8
  7
  
    
import warnings

  		




  9
  8
  
    

  		




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

  		




  11
  10
  
    
from django.template.defaultfilters import slugify

  		




  
  11
  
    
from django.utils import six

  		




  12
  12
  
    
from django.utils.translation import gettext as _

  		




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

  		




  14
  14
  
    

  		




  ......




  305
  305
  
    
            response = requests.get(metadata_file_path)

  		




  306
  306
  
    
            if not response.ok:

  		




  307
  307
  
    
                raise CommandError('Unable to open url %s' % metadata_file_path)

  		




  308
  
  
    
            metadata_file = StringIO(response.content)

  		




  
  308
  
    
            metadata_file = six.BytesIO(response.content)

  		




  309
  309
  
    
        else:

  		




  310
  310
  
    
            try:

  		




  311
  311
  
    
                metadata_file = file(metadata_file_path)

  		












  

    
      tests/test_idp_saml2.py
    
  





  2
  2
  
    
import datetime

  		




  3
  3
  
    
import base64

  		




  4
  4
  
    
import unittest

  		




  5
  
  
    
import StringIO

  		




  6
  5
  
    
from lxml.html import parse

  		




  7
  6
  
    

  		




  8
  7
  
    
from django.test import Client

  		




  ......




  10
  9
  
    
from django.contrib.auth import get_user_model, REDIRECT_FIELD_NAME

  		




  11
  10
  
    
from django.core.urlresolvers import reverse

  		




  12
  11
  
    
from django.core.files import File

  		




  
  12
  
    
from django.utils import six

  		




  13
  13
  
    
from django.utils.translation import gettext as _

  		




  14
  14
  
    
from django.utils.six.moves.urllib import parse as urlparse

  		




  15
  15
  
    

  		




  ......




  283
  283
  
    
            self.assertEqual(response.status_code, 200)

  		




  284
  284
  
    
            self.assertEqual(response['Content-type'].split(';')[0],

  		




  285
  285
  
    
                             'text/html')

  		




  286
  
  
    
            doc = parse(StringIO.StringIO(response.content)).getroot()

  		




  
  286
  
    
            doc = parse(six.BytesIO(response.content)).getroot()

  		




  287
  287
  
    
            self.assertEqual(len(doc.forms), 1,

  		




  288
  288
  
    
                             msg='the number of forms is not 1')

  		




  289
  289
  
    
            self.assertEqual(doc.forms[0].get('action'),

  		




  ......




  328
  328
  
    
            response = client.get(response['Location'])

  		




  329
  329
  
    
            self.assertEqual(response.status_code, 200)

  		




  330
  330
  
    
            self.assertEqual(response['Content-type'].split(';')[0], 'text/html')

  		




  331
  
  
    
            doc = parse(StringIO.StringIO(response.content)).getroot()

  		




  
  331
  
    
            doc = parse(six.BytesIO(response.content)).getroot()

  		




  332
  332
  
    
            self.assertEqual(len(doc.forms), 1, msg='the number of forms is not 1')

  		




  333
  333
  
    
            self.assertEqual(

  		




  334
  334
  
    
                doc.forms[0].get('action'), '%s/sso/POST' % self.base_url)

  		




  335
  
  
    
-