Projet

Général

Profil

0001-misc-remove-usage-of-django.utils.six-63683.patch

Frédéric Péters, 15 avril 2022 17:00

Télécharger (8,42 ko)

Voir les différences: 

Subject: [PATCH] misc: remove usage of django.utils.six (#63683)


 combo/apps/assets/api_views.py    | 2 +-
 combo/apps/assets/utils.py        | 2 +-
 combo/apps/assets/views.py        | 2 +-
 combo/manager/views.py            | 2 +-
 combo/utils/requests_wrapper.py   | 2 +-
 tests/test_assets.py              | 2 +-
 tests/test_cron.py                | 2 +-
 tests/test_import_export.py       | 2 +-
 tests/test_manager.py             | 2 +-
 tests/test_pages.py               | 2 +-
 tests/test_public.py              | 2 +-
 tests/test_public_templatetags.py | 2 +-
 tests/test_pwa.py                 | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)
combo/apps/assets/api_views.py
15 15 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16 

  		




  17
  17
  
    
import base64

  		




  
  18
  
    
from io import BytesIO

  		




  18
  19
  
    

  		




  19
  20
  
    
from django.core.files import File

  		




  20
  
  
    
from django.utils.six import BytesIO

  		




  21
  21
  
    
from rest_framework import permissions, serializers, status

  		




  22
  22
  
    
from rest_framework.generics import GenericAPIView

  		




  23
  23
  
    
from rest_framework.response import Response

  		












  

    
      combo/apps/assets/utils.py
    
  





  17
  17
  
    
import json

  		




  18
  18
  
    
import os

  		




  19
  19
  
    
import tarfile

  		




  
  20
  
    
from io import BytesIO

  		




  20
  21
  
    

  		




  21
  22
  
    
from django.core.files.storage import default_storage

  		




  22
  
  
    
from django.utils.six import BytesIO

  		




  23
  23
  
    

  		




  24
  24
  
    
from .models import Asset

  		




  25
  25
  
    

  		












  

    
      combo/apps/assets/views.py
    
  





  16
  16
  
    

  		




  17
  17
  
    
import os

  		




  18
  18
  
    
import tarfile

  		




  
  19
  
    
from io import BytesIO

  		




  19
  20
  
    

  		




  20
  21
  
    
import ckeditor

  		




  21
  22
  
    
from django.conf import settings

  		




  ......




  25
  26
  
    
from django.http import Http404, HttpResponse

  		




  26
  27
  
    
from django.shortcuts import get_object_or_404, redirect

  		




  27
  28
  
    
from django.urls import reverse, reverse_lazy

  		




  28
  
  
    
from django.utils.six import BytesIO

  		




  29
  29
  
    
from django.utils.translation import ugettext_lazy as _

  		




  30
  30
  
    
from django.views.generic import FormView, ListView, TemplateView

  		




  31
  31
  
    
from sorl.thumbnail.shortcuts import get_thumbnail

  		












  

    
      combo/manager/views.py
    
  





  18
  18
  
    
import hashlib

  		




  19
  19
  
    
import json

  		




  20
  20
  
    
import tarfile

  		




  
  21
  
    
from io import BytesIO

  		




  21
  22
  
    
from operator import attrgetter, itemgetter

  		




  22
  23
  
    

  		




  23
  24
  
    
from django import forms, template

  		




  ......




  31
  32
  
    
from django.urls import reverse, reverse_lazy

  		




  32
  33
  
    
from django.utils.encoding import force_bytes, force_text

  		




  33
  34
  
    
from django.utils.formats import date_format

  		




  34
  
  
    
from django.utils.six import BytesIO

  		




  35
  35
  
    
from django.utils.timezone import localtime

  		




  36
  36
  
    
from django.utils.translation import ugettext_lazy as _

  		




  37
  37
  
    
from django.views.decorators.csrf import requires_csrf_token

  		












  

    
      combo/utils/requests_wrapper.py
    
  





  17
  17
  
    
import hashlib

  		




  18
  18
  
    
import logging

  		




  19
  19
  
    
import urllib.parse

  		




  
  20
  
    
from io import BytesIO

  		




  20
  21
  
    

  		




  21
  22
  
    
from django.conf import settings

  		




  22
  23
  
    
from django.core.cache import cache

  		




  23
  24
  
    
from django.utils.encoding import smart_bytes

  		




  24
  25
  
    
from django.utils.http import urlencode

  		




  25
  
  
    
from django.utils.six import BytesIO

  		




  26
  26
  
    
from requests import Response

  		




  27
  27
  
    
from requests import Session as RequestsSession

  		




  28
  28
  
    
from requests.auth import AuthBase

  		












  

    
      tests/test_assets.py
    
  





  1
  1
  
    
import base64

  		




  2
  2
  
    
import os

  		




  3
  3
  
    
import tarfile

  		




  
  4
  
    
from io import BytesIO

  		




  4
  5
  
    

  		




  5
  6
  
    
import pytest

  		




  6
  7
  
    
from django.core.files import File

  		




  7
  8
  
    
from django.core.files.storage import default_storage

  		




  8
  9
  
    
from django.urls import reverse

  		




  9
  
  
    
from django.utils.six import BytesIO

  		




  10
  10
  
    

  		




  11
  11
  
    
from combo.apps.assets.models import Asset

  		




  12
  12
  
    
from combo.apps.assets.utils import (

  		












  

    
      tests/test_cron.py
    
  





  
  1
  
    
from io import StringIO

  		




  1
  2
  
    
from unittest import mock

  		




  2
  3
  
    

  		




  3
  4
  
    
import pytest

  		




  4
  5
  
    
from django.core.management import call_command

  		




  5
  6
  
    
from django.core.management.base import CommandError

  		




  6
  7
  
    
from django.test import override_settings

  		




  7
  
  
    
from django.utils.six import StringIO

  		




  8
  8
  
    

  		




  9
  9
  
    
pytestmark = pytest.mark.django_db

  		




  10
  10
  
    

  		












  

    
      tests/test_import_export.py
    
  





  5
  5
  
    
import sys

  		




  6
  6
  
    
import tarfile

  		




  7
  7
  
    
import tempfile

  		




  
  8
  
    
from io import BytesIO, StringIO

  		




  8
  9
  
    

  		




  9
  10
  
    
import pytest

  		




  10
  11
  
    
from django.contrib.auth.models import Group

  		




  ......




  13
  14
  
    
from django.core.management import call_command

  		




  14
  15
  
    
from django.core.management.base import CommandError

  		




  15
  16
  
    
from django.utils.encoding import force_bytes, force_text

  		




  16
  
  
    
from django.utils.six import BytesIO, StringIO

  		




  17
  17
  
    

  		




  18
  18
  
    
from combo.apps.assets.models import Asset

  		




  19
  19
  
    
from combo.apps.assets.utils import clean_assets_files

  		












  

    
      tests/test_manager.py
    
  





  5
  5
  
    
import re

  		




  6
  6
  
    
import shutil

  		




  7
  7
  
    
import urllib.parse

  		




  
  8
  
    
from io import BytesIO

  		




  8
  9
  
    
from unittest import mock

  		




  9
  10
  
    

  		




  10
  11
  
    
import pytest

  		




  ......




  21
  22
  
    
from django.urls import reverse

  		




  22
  23
  
    
from django.utils.encoding import force_bytes, force_str

  		




  23
  24
  
    
from django.utils.http import urlencode

  		




  24
  
  
    
from django.utils.six import BytesIO

  		




  25
  25
  
    
from django.utils.timezone import now

  		




  26
  26
  
    
from pyquery import PyQuery

  		




  27
  27
  
    
from webtest import Upload

  		












  

    
      tests/test_pages.py
    
  





  1
  1
  
    
import os

  		




  2
  2
  
    
import sys

  		




  
  3
  
    
from io import StringIO

  		




  3
  4
  
    

  		




  4
  5
  
    
import pytest

  		




  5
  6
  
    
from django.conf import settings

  		




  6
  7
  
    
from django.contrib.auth.models import Group, User

  		




  7
  8
  
    
from django.test import override_settings

  		




  8
  9
  
    
from django.test.client import RequestFactory

  		




  9
  
  
    
from django.utils.six import StringIO

  		




  10
  10
  
    

  		




  11
  11
  
    
from combo.data.management.commands.export_site import Command as ExportSiteCommand

  		




  12
  12
  
    
from combo.data.management.commands.import_site import Command as ImportSiteCommand

  		












  

    
      tests/test_public.py
    
  





  3
  3
  
    
import os

  		




  4
  4
  
    
import re

  		




  5
  5
  
    
import urllib.parse

  		




  
  6
  
    
from io import StringIO

  		




  6
  7
  
    
from unittest import mock

  		




  7
  8
  
    

  		




  8
  9
  
    
import pytest

  		




  ......




  14
  15
  
    
from django.test.utils import CaptureQueriesContext

  		




  15
  16
  
    
from django.urls import reverse

  		




  16
  17
  
    
from django.utils.http import quote

  		




  17
  
  
    
from django.utils.six import StringIO

  		




  18
  18
  
    

  		




  19
  19
  
    
try:

  		




  20
  20
  
    
    import mellon  # pylint: disable=unused-import

  		












  

    
      tests/test_public_templatetags.py
    
  





  2
  2
  
    
import os

  		




  3
  3
  
    
import shutil

  		




  4
  4
  
    
import time

  		




  
  5
  
    
from io import StringIO

  		




  5
  6
  
    

  		




  6
  7
  
    
import pytest

  		




  7
  8
  
    
from django.contrib.auth.models import AnonymousUser, Group, User

  		




  ......




  11
  12
  
    
from django.template.exceptions import TemplateSyntaxError

  		




  12
  13
  
    
from django.test import override_settings

  		




  13
  14
  
    
from django.test.client import RequestFactory

  		




  14
  
  
    
from django.utils.six import StringIO

  		




  15
  15
  
    
from django.utils.timezone import now

  		




  16
  16
  
    

  		




  17
  17
  
    
from combo.apps.assets.models import Asset

  		












  

    
      tests/test_pwa.py
    
  





  1
  1
  
    
import base64

  		




  2
  2
  
    
from html.parser import HTMLParser

  		




  
  3
  
    
from io import BytesIO

  		




  3
  4
  
    
from unittest import mock

  		




  4
  5
  
    

  		




  5
  6
  
    
import pytest

  		




  ......




  9
  10
  
    
from django.test import override_settings

  		




  10
  11
  
    
from django.test.client import RequestFactory

  		




  11
  12
  
    
from django.urls import reverse

  		




  12
  
  
    
from django.utils.six import BytesIO

  		




  13
  13
  
    
from webtest import Upload

  		




  14
  14
  
    

  		




  15
  15
  
    
from combo.apps.notifications.models import Notification

  		




  16
  
  
    
-