misc: remove usage of django.utils.six (#63683)
This commit is contained in:
parent
514d8bbaaf
commit
d9eeeeea61
|
@ -15,9 +15,9 @@
|
|||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import base64
|
||||
from io import BytesIO
|
||||
|
||||
from django.core.files import File
|
||||
from django.utils.six import BytesIO
|
||||
from rest_framework import permissions, serializers, status
|
||||
from rest_framework.generics import GenericAPIView
|
||||
from rest_framework.response import Response
|
||||
|
|
|
@ -17,9 +17,9 @@
|
|||
import json
|
||||
import os
|
||||
import tarfile
|
||||
from io import BytesIO
|
||||
|
||||
from django.core.files.storage import default_storage
|
||||
from django.utils.six import BytesIO
|
||||
|
||||
from .models import Asset
|
||||
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
|
||||
import os
|
||||
import tarfile
|
||||
from io import BytesIO
|
||||
|
||||
import ckeditor
|
||||
from django.conf import settings
|
||||
|
@ -25,7 +26,6 @@ from django.core.files.storage import default_storage
|
|||
from django.http import Http404, HttpResponse
|
||||
from django.shortcuts import get_object_or_404, redirect
|
||||
from django.urls import reverse, reverse_lazy
|
||||
from django.utils.six import BytesIO
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.views.generic import FormView, ListView, TemplateView
|
||||
from sorl.thumbnail.shortcuts import get_thumbnail
|
||||
|
|
|
@ -18,6 +18,7 @@ import datetime
|
|||
import hashlib
|
||||
import json
|
||||
import tarfile
|
||||
from io import BytesIO
|
||||
from operator import attrgetter, itemgetter
|
||||
|
||||
from django import forms, template
|
||||
|
@ -31,7 +32,6 @@ from django.template import engines
|
|||
from django.urls import reverse, reverse_lazy
|
||||
from django.utils.encoding import force_bytes, force_text
|
||||
from django.utils.formats import date_format
|
||||
from django.utils.six import BytesIO
|
||||
from django.utils.timezone import localtime
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.views.decorators.csrf import requires_csrf_token
|
||||
|
|
|
@ -17,12 +17,12 @@
|
|||
import hashlib
|
||||
import logging
|
||||
import urllib.parse
|
||||
from io import BytesIO
|
||||
|
||||
from django.conf import settings
|
||||
from django.core.cache import cache
|
||||
from django.utils.encoding import smart_bytes
|
||||
from django.utils.http import urlencode
|
||||
from django.utils.six import BytesIO
|
||||
from requests import Response
|
||||
from requests import Session as RequestsSession
|
||||
from requests.auth import AuthBase
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
import base64
|
||||
import os
|
||||
import tarfile
|
||||
from io import BytesIO
|
||||
|
||||
import pytest
|
||||
from django.core.files import File
|
||||
from django.core.files.storage import default_storage
|
||||
from django.urls import reverse
|
||||
from django.utils.six import BytesIO
|
||||
|
||||
from combo.apps.assets.models import Asset
|
||||
from combo.apps.assets.utils import (
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
from io import StringIO
|
||||
from unittest import mock
|
||||
|
||||
import pytest
|
||||
from django.core.management import call_command
|
||||
from django.core.management.base import CommandError
|
||||
from django.test import override_settings
|
||||
from django.utils.six import StringIO
|
||||
|
||||
pytestmark = pytest.mark.django_db
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@ import shutil
|
|||
import sys
|
||||
import tarfile
|
||||
import tempfile
|
||||
from io import BytesIO, StringIO
|
||||
|
||||
import pytest
|
||||
from django.contrib.auth.models import Group
|
||||
|
@ -13,7 +14,6 @@ from django.core.files.storage import default_storage
|
|||
from django.core.management import call_command
|
||||
from django.core.management.base import CommandError
|
||||
from django.utils.encoding import force_bytes, force_text
|
||||
from django.utils.six import BytesIO, StringIO
|
||||
|
||||
from combo.apps.assets.models import Asset
|
||||
from combo.apps.assets.utils import clean_assets_files
|
||||
|
|
|
@ -5,6 +5,7 @@ import os
|
|||
import re
|
||||
import shutil
|
||||
import urllib.parse
|
||||
from io import BytesIO
|
||||
from unittest import mock
|
||||
|
||||
import pytest
|
||||
|
@ -21,7 +22,6 @@ from django.test.utils import CaptureQueriesContext
|
|||
from django.urls import reverse
|
||||
from django.utils.encoding import force_bytes, force_str
|
||||
from django.utils.http import urlencode
|
||||
from django.utils.six import BytesIO
|
||||
from django.utils.timezone import now
|
||||
from pyquery import PyQuery
|
||||
from webtest import Upload
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
import os
|
||||
import sys
|
||||
from io import StringIO
|
||||
|
||||
import pytest
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import Group, User
|
||||
from django.test import override_settings
|
||||
from django.test.client import RequestFactory
|
||||
from django.utils.six import StringIO
|
||||
|
||||
from combo.data.management.commands.export_site import Command as ExportSiteCommand
|
||||
from combo.data.management.commands.import_site import Command as ImportSiteCommand
|
||||
|
|
|
@ -3,6 +3,7 @@ import json
|
|||
import os
|
||||
import re
|
||||
import urllib.parse
|
||||
from io import StringIO
|
||||
from unittest import mock
|
||||
|
||||
import pytest
|
||||
|
@ -14,7 +15,6 @@ from django.test import override_settings
|
|||
from django.test.utils import CaptureQueriesContext
|
||||
from django.urls import reverse
|
||||
from django.utils.http import quote
|
||||
from django.utils.six import StringIO
|
||||
|
||||
try:
|
||||
import mellon # pylint: disable=unused-import
|
||||
|
|
|
@ -2,6 +2,7 @@ import datetime
|
|||
import os
|
||||
import shutil
|
||||
import time
|
||||
from io import StringIO
|
||||
|
||||
import pytest
|
||||
from django.contrib.auth.models import AnonymousUser, Group, User
|
||||
|
@ -11,7 +12,6 @@ from django.template import Context, Template
|
|||
from django.template.exceptions import TemplateSyntaxError
|
||||
from django.test import override_settings
|
||||
from django.test.client import RequestFactory
|
||||
from django.utils.six import StringIO
|
||||
from django.utils.timezone import now
|
||||
|
||||
from combo.apps.assets.models import Asset
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
import base64
|
||||
from html.parser import HTMLParser
|
||||
from io import BytesIO
|
||||
from unittest import mock
|
||||
|
||||
import pytest
|
||||
|
@ -9,7 +10,6 @@ from django.template import Context, Template
|
|||
from django.test import override_settings
|
||||
from django.test.client import RequestFactory
|
||||
from django.urls import reverse
|
||||
from django.utils.six import BytesIO
|
||||
from webtest import Upload
|
||||
|
||||
from combo.apps.notifications.models import Notification
|
||||
|
|
Loading…
Reference in New Issue