From ec7b596ce491701febed4d2026d8dbfea501feb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 17 Apr 2022 10:44:07 +0200 Subject: [PATCH] misc: remove usage of django.utils.six (#63683) --- combo_plugin_gnm/management/commands/gnm_reporting.py | 2 +- combo_plugin_gnm/templatetags/gnm.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/combo_plugin_gnm/management/commands/gnm_reporting.py b/combo_plugin_gnm/management/commands/gnm_reporting.py index 7198798..864c35b 100644 --- a/combo_plugin_gnm/management/commands/gnm_reporting.py +++ b/combo_plugin_gnm/management/commands/gnm_reporting.py @@ -15,6 +15,7 @@ # along with this program. If not, see . import html +from io import BytesIO import os import re import xml.etree.ElementTree as ET @@ -24,7 +25,6 @@ from django.conf import settings from django.contrib.auth import get_user_model from django.core.files.storage import default_storage from django.core.management.base import BaseCommand, CommandError -from django.utils.six import BytesIO from combo.data.models import TextCell from combo.utils import requests diff --git a/combo_plugin_gnm/templatetags/gnm.py b/combo_plugin_gnm/templatetags/gnm.py index 49abdeb..4d4bf15 100644 --- a/combo_plugin_gnm/templatetags/gnm.py +++ b/combo_plugin_gnm/templatetags/gnm.py @@ -30,7 +30,6 @@ from django import template from django.conf import settings from django.core.serializers.json import DjangoJSONEncoder from django.core import signing -from django.utils import six from django.utils.dateparse import parse_date, parse_datetime from django.utils.http import quote from django.utils.html import format_html @@ -595,7 +594,7 @@ def as_commune(user_data): if not user_data: return None - if isinstance(user_data, six.string_types): + if isinstance(user_data, str): # user_data is expected to be (page) slug collectivities = get_gnm_collectivities() for collectivity in collectivities: