From 7dfc65e8b971bcd566119c820a3c454bfbb7bf26 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Fri, 11 Sep 2020 16:28:19 +0200 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(-) diff --git a/passerelle_minint/minint_maarch/views.py b/passerelle_minint/minint_maarch/views.py index b1fc964..ddc28d9 100644 --- a/passerelle_minint/minint_maarch/views.py +++ b/passerelle_minint/minint_maarch/views.py @@ -22,6 +22,7 @@ import requests from django.views.generic import DetailView as GenericDetailView from django.utils.decorators import method_decorator +from django.utils import six from django.utils.six.moves.urllib import parse as urlparse from django.views.decorators.csrf import csrf_exempt @@ -202,7 +203,7 @@ class ResourceView(DetailView): data.type = 'date' value = datetime.strptime(value[:19], '%Y-%m-%dT%H:%M:%S') value = value.strftime('%d-%m-%Y %H:%M:%S') - elif isinstance(value, basestring): + elif isinstance(value, six.string_types): data.type = 'string' elif isinstance(value, int): data.type = 'integer' @@ -231,7 +232,7 @@ class ResourceView(DetailView): data.type = 'date' value = datetime.strptime(value[:19], '%Y-%m-%dT%H:%M:%S') value = value.strftime('%d-%m-%Y %H:%M:%S') - elif isinstance(value, basestring): + elif isinstance(value, six.string_types): data.type = 'string' elif isinstance(value, int): data.type = 'int' @@ -606,7 +607,7 @@ class DebugView(DetailView): data.type = 'date' value = datetime.strptime(value[:19], '%Y-%m-%dT%H:%M:%S') value = value.strftime('%d-%m-%Y %H:%M:%S') - elif isinstance(value, basestring): + elif isinstance(value, six.string_types): data.type = 'string' elif isinstance(value, int): data.type = 'integer' @@ -635,7 +636,7 @@ class DebugView(DetailView): data.type = 'date' value = datetime.strptime(value[:19], '%Y-%m-%dT%H:%M:%S') value = value.strftime('%d-%m-%Y %H:%M:%S') - elif isinstance(value, basestring): + elif isinstance(value, six.string_types): data.type = 'string' elif isinstance(value, int): data.type = 'int'