Projet

Général

Profil

0001-py3-use-six.string_types-instead-of-basestring-46576.patch

Thomas Noël, 11 septembre 2020 16:29

Télécharger (2,71 ko)

Voir les différences:

Subject: [PATCH] py3: use six.string_types instead of basestring (#46576)

 passerelle_minint/minint_maarch/views.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
passerelle_minint/minint_maarch/views.py
22 22

  
23 23
from django.views.generic import DetailView as GenericDetailView
24 24
from django.utils.decorators import method_decorator
25
from django.utils import six
25 26
from django.utils.six.moves.urllib import parse as urlparse
26 27
from django.views.decorators.csrf import csrf_exempt
27 28

  
......
202 203
                    data.type = 'date'
203 204
                    value = datetime.strptime(value[:19], '%Y-%m-%dT%H:%M:%S')
204 205
                    value = value.strftime('%d-%m-%Y %H:%M:%S')
205
                elif isinstance(value, basestring):
206
                elif isinstance(value, six.string_types):
206 207
                    data.type = 'string'
207 208
                elif isinstance(value, int):
208 209
                    data.type = 'integer'
......
231 232
                    data.type = 'date'
232 233
                    value = datetime.strptime(value[:19], '%Y-%m-%dT%H:%M:%S')
233 234
                    value = value.strftime('%d-%m-%Y %H:%M:%S')
234
                elif isinstance(value, basestring):
235
                elif isinstance(value, six.string_types):
235 236
                    data.type = 'string'
236 237
                elif isinstance(value, int):
237 238
                    data.type = 'int'
......
606 607
                    data.type = 'date'
607 608
                    value = datetime.strptime(value[:19], '%Y-%m-%dT%H:%M:%S')
608 609
                    value = value.strftime('%d-%m-%Y %H:%M:%S')
609
                elif isinstance(value, basestring):
610
                elif isinstance(value, six.string_types):
610 611
                    data.type = 'string'
611 612
                elif isinstance(value, int):
612 613
                    data.type = 'integer'
......
635 636
                    data.type = 'date'
636 637
                    value = datetime.strptime(value[:19], '%Y-%m-%dT%H:%M:%S')
637 638
                    value = value.strftime('%d-%m-%Y %H:%M:%S')
638
                elif isinstance(value, basestring):
639
                elif isinstance(value, six.string_types):
639 640
                    data.type = 'string'
640 641
                elif isinstance(value, int):
641 642
                    data.type = 'int'
642
-