mirror of
https://github.com/django/django.git
synced 2024-12-23 01:25:58 +00:00
Replaced six.BytesIO with io.BytesIO
This commit is contained in:
parent
ecf4ed246a
commit
6e3fe089dd
@ -14,6 +14,7 @@ from email.mime.message import MIMEMessage
|
||||
from email.mime.multipart import MIMEMultipart
|
||||
from email.mime.text import MIMEText
|
||||
from email.utils import formataddr, formatdate, getaddresses, parseaddr
|
||||
from io import BytesIO
|
||||
|
||||
from django.conf import settings
|
||||
from django.core.mail.utils import DNS_NAME
|
||||
@ -145,7 +146,7 @@ class MIMEMixin():
|
||||
This overrides the default as_bytes() implementation to not mangle
|
||||
lines that begin with 'From '. See bug #13433 for details.
|
||||
"""
|
||||
fp = six.BytesIO()
|
||||
fp = BytesIO()
|
||||
g = generator.BytesGenerator(fp, mangle_from_=False)
|
||||
g.flatten(self, unixfrom=unixfrom, linesep=linesep)
|
||||
return fp.getvalue()
|
||||
|
@ -9,6 +9,7 @@ import os
|
||||
import shutil
|
||||
import tempfile as sys_tempfile
|
||||
import unittest
|
||||
from io import BytesIO
|
||||
|
||||
from django.core.files import temp as tempfile
|
||||
from django.core.files.uploadedfile import SimpleUploadedFile
|
||||
@ -16,7 +17,7 @@ from django.http.multipartparser import MultiPartParser, parse_header
|
||||
from django.test import SimpleTestCase, TestCase, client, override_settings
|
||||
from django.utils.encoding import force_bytes
|
||||
from django.utils.http import urlquote
|
||||
from django.utils.six import PY2, BytesIO, StringIO
|
||||
from django.utils.six import PY2, StringIO
|
||||
|
||||
from . import uploadhandler
|
||||
from .models import FileModel
|
||||
|
@ -1,9 +1,10 @@
|
||||
from io import BytesIO
|
||||
|
||||
from django.core.handlers.wsgi import WSGIRequest
|
||||
from django.core.servers.basehttp import WSGIRequestHandler
|
||||
from django.test import SimpleTestCase
|
||||
from django.test.client import RequestFactory
|
||||
from django.test.utils import captured_stderr
|
||||
from django.utils.six import BytesIO
|
||||
|
||||
|
||||
class Stub(object):
|
||||
|
Loading…
Reference in New Issue
Block a user