mirror of
https://github.com/django/django.git
synced 2025-10-31 09:41:08 +00:00
Refs #33476 -- Reformatted code with Black.
This commit is contained in:
committed by
Mariusz Felisiak
parent
f68fa8b45d
commit
9c19aff7c7
@@ -13,14 +13,17 @@ from django.core.files.base import ContentFile
|
||||
from django.core.files.move import file_move_safe
|
||||
from django.core.files.temp import NamedTemporaryFile
|
||||
from django.core.files.uploadedfile import (
|
||||
InMemoryUploadedFile, SimpleUploadedFile, TemporaryUploadedFile,
|
||||
InMemoryUploadedFile,
|
||||
SimpleUploadedFile,
|
||||
TemporaryUploadedFile,
|
||||
UploadedFile,
|
||||
)
|
||||
from django.test import override_settings
|
||||
|
||||
try:
|
||||
from PIL import Image, features
|
||||
HAS_WEBP = features.check('webp')
|
||||
|
||||
HAS_WEBP = features.check("webp")
|
||||
except ImportError:
|
||||
Image = None
|
||||
HAS_WEBP = False
|
||||
@@ -30,11 +33,11 @@ else:
|
||||
|
||||
class FileTests(unittest.TestCase):
|
||||
def test_unicode_uploadedfile_name(self):
|
||||
uf = UploadedFile(name='¿Cómo?', content_type='text')
|
||||
uf = UploadedFile(name="¿Cómo?", content_type="text")
|
||||
self.assertIs(type(repr(uf)), str)
|
||||
|
||||
def test_unicode_file_name(self):
|
||||
f = File(None, 'djángö')
|
||||
f = File(None, "djángö")
|
||||
self.assertIs(type(repr(f)), str)
|
||||
|
||||
def test_context_manager(self):
|
||||
@@ -47,10 +50,10 @@ class FileTests(unittest.TestCase):
|
||||
self.assertTrue(orig_file.closed)
|
||||
|
||||
def test_open_resets_opened_file_to_start_and_returns_context_manager(self):
|
||||
file = File(BytesIO(b'content'))
|
||||
file = File(BytesIO(b"content"))
|
||||
file.read()
|
||||
with file.open() as f:
|
||||
self.assertEqual(f.read(), b'content')
|
||||
self.assertEqual(f.read(), b"content")
|
||||
|
||||
def test_open_reopens_closed_file_and_returns_context_manager(self):
|
||||
temporary_file = tempfile.NamedTemporaryFile(delete=False)
|
||||
@@ -81,7 +84,7 @@ class FileTests(unittest.TestCase):
|
||||
# Should not set mode to None if it is not present.
|
||||
# See #14681, stdlib gzip module crashes if mode is set to None
|
||||
file = SimpleUploadedFile("mode_test.txt", b"content")
|
||||
self.assertFalse(hasattr(file, 'mode'))
|
||||
self.assertFalse(hasattr(file, "mode"))
|
||||
gzip.GzipFile(fileobj=file)
|
||||
|
||||
def test_file_iteration(self):
|
||||
@@ -89,80 +92,90 @@ class FileTests(unittest.TestCase):
|
||||
File objects should yield lines when iterated over.
|
||||
Refs #22107.
|
||||
"""
|
||||
file = File(BytesIO(b'one\ntwo\nthree'))
|
||||
self.assertEqual(list(file), [b'one\n', b'two\n', b'three'])
|
||||
file = File(BytesIO(b"one\ntwo\nthree"))
|
||||
self.assertEqual(list(file), [b"one\n", b"two\n", b"three"])
|
||||
|
||||
def test_file_iteration_windows_newlines(self):
|
||||
"""
|
||||
#8149 - File objects with \r\n line endings should yield lines
|
||||
when iterated over.
|
||||
"""
|
||||
f = File(BytesIO(b'one\r\ntwo\r\nthree'))
|
||||
self.assertEqual(list(f), [b'one\r\n', b'two\r\n', b'three'])
|
||||
f = File(BytesIO(b"one\r\ntwo\r\nthree"))
|
||||
self.assertEqual(list(f), [b"one\r\n", b"two\r\n", b"three"])
|
||||
|
||||
def test_file_iteration_mac_newlines(self):
|
||||
"""
|
||||
#8149 - File objects with \r line endings should yield lines
|
||||
when iterated over.
|
||||
"""
|
||||
f = File(BytesIO(b'one\rtwo\rthree'))
|
||||
self.assertEqual(list(f), [b'one\r', b'two\r', b'three'])
|
||||
f = File(BytesIO(b"one\rtwo\rthree"))
|
||||
self.assertEqual(list(f), [b"one\r", b"two\r", b"three"])
|
||||
|
||||
def test_file_iteration_mixed_newlines(self):
|
||||
f = File(BytesIO(b'one\rtwo\nthree\r\nfour'))
|
||||
self.assertEqual(list(f), [b'one\r', b'two\n', b'three\r\n', b'four'])
|
||||
f = File(BytesIO(b"one\rtwo\nthree\r\nfour"))
|
||||
self.assertEqual(list(f), [b"one\r", b"two\n", b"three\r\n", b"four"])
|
||||
|
||||
def test_file_iteration_with_unix_newline_at_chunk_boundary(self):
|
||||
f = File(BytesIO(b'one\ntwo\nthree'))
|
||||
f = File(BytesIO(b"one\ntwo\nthree"))
|
||||
# Set chunk size to create a boundary after \n:
|
||||
# b'one\n...
|
||||
# ^
|
||||
f.DEFAULT_CHUNK_SIZE = 4
|
||||
self.assertEqual(list(f), [b'one\n', b'two\n', b'three'])
|
||||
self.assertEqual(list(f), [b"one\n", b"two\n", b"three"])
|
||||
|
||||
def test_file_iteration_with_windows_newline_at_chunk_boundary(self):
|
||||
f = File(BytesIO(b'one\r\ntwo\r\nthree'))
|
||||
f = File(BytesIO(b"one\r\ntwo\r\nthree"))
|
||||
# Set chunk size to create a boundary between \r and \n:
|
||||
# b'one\r\n...
|
||||
# ^
|
||||
f.DEFAULT_CHUNK_SIZE = 4
|
||||
self.assertEqual(list(f), [b'one\r\n', b'two\r\n', b'three'])
|
||||
self.assertEqual(list(f), [b"one\r\n", b"two\r\n", b"three"])
|
||||
|
||||
def test_file_iteration_with_mac_newline_at_chunk_boundary(self):
|
||||
f = File(BytesIO(b'one\rtwo\rthree'))
|
||||
f = File(BytesIO(b"one\rtwo\rthree"))
|
||||
# Set chunk size to create a boundary after \r:
|
||||
# b'one\r...
|
||||
# ^
|
||||
f.DEFAULT_CHUNK_SIZE = 4
|
||||
self.assertEqual(list(f), [b'one\r', b'two\r', b'three'])
|
||||
self.assertEqual(list(f), [b"one\r", b"two\r", b"three"])
|
||||
|
||||
def test_file_iteration_with_text(self):
|
||||
f = File(StringIO('one\ntwo\nthree'))
|
||||
self.assertEqual(list(f), ['one\n', 'two\n', 'three'])
|
||||
f = File(StringIO("one\ntwo\nthree"))
|
||||
self.assertEqual(list(f), ["one\n", "two\n", "three"])
|
||||
|
||||
def test_readable(self):
|
||||
with tempfile.TemporaryFile() as temp, File(temp, name='something.txt') as test_file:
|
||||
with tempfile.TemporaryFile() as temp, File(
|
||||
temp, name="something.txt"
|
||||
) as test_file:
|
||||
self.assertTrue(test_file.readable())
|
||||
self.assertFalse(test_file.readable())
|
||||
|
||||
def test_writable(self):
|
||||
with tempfile.TemporaryFile() as temp, File(temp, name='something.txt') as test_file:
|
||||
with tempfile.TemporaryFile() as temp, File(
|
||||
temp, name="something.txt"
|
||||
) as test_file:
|
||||
self.assertTrue(test_file.writable())
|
||||
self.assertFalse(test_file.writable())
|
||||
with tempfile.TemporaryFile('rb') as temp, File(temp, name='something.txt') as test_file:
|
||||
with tempfile.TemporaryFile("rb") as temp, File(
|
||||
temp, name="something.txt"
|
||||
) as test_file:
|
||||
self.assertFalse(test_file.writable())
|
||||
|
||||
def test_seekable(self):
|
||||
with tempfile.TemporaryFile() as temp, File(temp, name='something.txt') as test_file:
|
||||
with tempfile.TemporaryFile() as temp, File(
|
||||
temp, name="something.txt"
|
||||
) as test_file:
|
||||
self.assertTrue(test_file.seekable())
|
||||
self.assertFalse(test_file.seekable())
|
||||
|
||||
def test_io_wrapper(self):
|
||||
content = "vive l'été\n"
|
||||
with tempfile.TemporaryFile() as temp, File(temp, name='something.txt') as test_file:
|
||||
with tempfile.TemporaryFile() as temp, File(
|
||||
temp, name="something.txt"
|
||||
) as test_file:
|
||||
test_file.write(content.encode())
|
||||
test_file.seek(0)
|
||||
wrapper = TextIOWrapper(test_file, 'utf-8', newline='\n')
|
||||
wrapper = TextIOWrapper(test_file, "utf-8", newline="\n")
|
||||
self.assertEqual(wrapper.read(), content)
|
||||
wrapper.write(content)
|
||||
wrapper.seek(0)
|
||||
@@ -172,7 +185,7 @@ class FileTests(unittest.TestCase):
|
||||
self.assertEqual(test_file.read(), (content * 2).encode())
|
||||
|
||||
def test_exclusive_lock(self):
|
||||
file_path = Path(__file__).parent / 'test.png'
|
||||
file_path = Path(__file__).parent / "test.png"
|
||||
with open(file_path) as f1, open(file_path) as f2:
|
||||
self.assertIs(locks.lock(f1, locks.LOCK_EX), True)
|
||||
self.assertIs(locks.lock(f2, locks.LOCK_EX | locks.LOCK_NB), False)
|
||||
@@ -180,7 +193,7 @@ class FileTests(unittest.TestCase):
|
||||
self.assertIs(locks.unlock(f1), True)
|
||||
|
||||
def test_shared_lock(self):
|
||||
file_path = Path(__file__).parent / 'test.png'
|
||||
file_path = Path(__file__).parent / "test.png"
|
||||
with open(file_path) as f1, open(file_path) as f2:
|
||||
self.assertIs(locks.lock(f1, locks.LOCK_SH), True)
|
||||
self.assertIs(locks.lock(f2, locks.LOCK_SH | locks.LOCK_NB), True)
|
||||
@@ -193,11 +206,12 @@ class NoNameFileTestCase(unittest.TestCase):
|
||||
Other examples of unnamed files may be tempfile.SpooledTemporaryFile or
|
||||
urllib.urlopen()
|
||||
"""
|
||||
|
||||
def test_noname_file_default_name(self):
|
||||
self.assertIsNone(File(BytesIO(b'A file with no name')).name)
|
||||
self.assertIsNone(File(BytesIO(b"A file with no name")).name)
|
||||
|
||||
def test_noname_file_get_size(self):
|
||||
self.assertEqual(File(BytesIO(b'A file with no name')).size, 19)
|
||||
self.assertEqual(File(BytesIO(b"A file with no name")).size, 19)
|
||||
|
||||
|
||||
class ContentFileTestCase(unittest.TestCase):
|
||||
@@ -220,41 +234,43 @@ class ContentFileTestCase(unittest.TestCase):
|
||||
self.assertIsInstance(ContentFile("español").read(), str)
|
||||
|
||||
def test_open_resets_file_to_start_and_returns_context_manager(self):
|
||||
file = ContentFile(b'content')
|
||||
file = ContentFile(b"content")
|
||||
with file.open() as f:
|
||||
self.assertEqual(f.read(), b'content')
|
||||
self.assertEqual(f.read(), b"content")
|
||||
with file.open() as f:
|
||||
self.assertEqual(f.read(), b'content')
|
||||
self.assertEqual(f.read(), b"content")
|
||||
|
||||
def test_size_changing_after_writing(self):
|
||||
"""ContentFile.size changes after a write()."""
|
||||
f = ContentFile('')
|
||||
f = ContentFile("")
|
||||
self.assertEqual(f.size, 0)
|
||||
f.write('Test ')
|
||||
f.write('string')
|
||||
f.write("Test ")
|
||||
f.write("string")
|
||||
self.assertEqual(f.size, 11)
|
||||
with f.open() as fh:
|
||||
self.assertEqual(fh.read(), 'Test string')
|
||||
self.assertEqual(fh.read(), "Test string")
|
||||
|
||||
|
||||
class InMemoryUploadedFileTests(unittest.TestCase):
|
||||
def test_open_resets_file_to_start_and_returns_context_manager(self):
|
||||
uf = InMemoryUploadedFile(StringIO('1'), '', 'test', 'text/plain', 1, 'utf8')
|
||||
uf = InMemoryUploadedFile(StringIO("1"), "", "test", "text/plain", 1, "utf8")
|
||||
uf.read()
|
||||
with uf.open() as f:
|
||||
self.assertEqual(f.read(), '1')
|
||||
self.assertEqual(f.read(), "1")
|
||||
|
||||
|
||||
class TemporaryUploadedFileTests(unittest.TestCase):
|
||||
def test_extension_kept(self):
|
||||
"""The temporary file name has the same suffix as the original file."""
|
||||
with TemporaryUploadedFile('test.txt', 'text/plain', 1, 'utf8') as temp_file:
|
||||
self.assertTrue(temp_file.file.name.endswith('.upload.txt'))
|
||||
with TemporaryUploadedFile("test.txt", "text/plain", 1, "utf8") as temp_file:
|
||||
self.assertTrue(temp_file.file.name.endswith(".upload.txt"))
|
||||
|
||||
def test_file_upload_temp_dir_pathlib(self):
|
||||
with tempfile.TemporaryDirectory() as tmp_dir:
|
||||
with override_settings(FILE_UPLOAD_TEMP_DIR=Path(tmp_dir)):
|
||||
with TemporaryUploadedFile('test.txt', 'text/plain', 1, 'utf-8') as temp_file:
|
||||
with TemporaryUploadedFile(
|
||||
"test.txt", "text/plain", 1, "utf-8"
|
||||
) as temp_file:
|
||||
self.assertTrue(os.path.exists(temp_file.file.name))
|
||||
|
||||
|
||||
@@ -262,6 +278,7 @@ class DimensionClosingBug(unittest.TestCase):
|
||||
"""
|
||||
get_image_dimensions() properly closes files (#8817)
|
||||
"""
|
||||
|
||||
@unittest.skipUnless(Image, "Pillow not installed")
|
||||
def test_not_closing_of_files(self):
|
||||
"""
|
||||
@@ -302,7 +319,9 @@ class DimensionClosingBug(unittest.TestCase):
|
||||
|
||||
images.open = catching_open
|
||||
try:
|
||||
images.get_image_dimensions(os.path.join(os.path.dirname(__file__), "test1.png"))
|
||||
images.get_image_dimensions(
|
||||
os.path.join(os.path.dirname(__file__), "test1.png")
|
||||
)
|
||||
finally:
|
||||
del images.open
|
||||
self.assertTrue(FileWrapper._closed)
|
||||
@@ -313,13 +332,14 @@ class InconsistentGetImageDimensionsBug(unittest.TestCase):
|
||||
get_image_dimensions() works properly after various calls
|
||||
using a file handler (#11158)
|
||||
"""
|
||||
|
||||
@unittest.skipUnless(Image, "Pillow not installed")
|
||||
def test_multiple_calls(self):
|
||||
"""
|
||||
Multiple calls of get_image_dimensions() should return the same size.
|
||||
"""
|
||||
img_path = os.path.join(os.path.dirname(__file__), "test.png")
|
||||
with open(img_path, 'rb') as fh:
|
||||
with open(img_path, "rb") as fh:
|
||||
image = images.ImageFile(fh)
|
||||
image_pil = Image.open(fh)
|
||||
size_1 = images.get_image_dimensions(image)
|
||||
@@ -335,13 +355,12 @@ class InconsistentGetImageDimensionsBug(unittest.TestCase):
|
||||
"""
|
||||
img_path = os.path.join(os.path.dirname(__file__), "magic.png")
|
||||
size = images.get_image_dimensions(img_path)
|
||||
with open(img_path, 'rb') as fh:
|
||||
with open(img_path, "rb") as fh:
|
||||
self.assertEqual(size, Image.open(fh).size)
|
||||
|
||||
|
||||
@unittest.skipUnless(Image, "Pillow not installed")
|
||||
class GetImageDimensionsTests(unittest.TestCase):
|
||||
|
||||
def test_invalid_image(self):
|
||||
"""
|
||||
get_image_dimensions() should return (None, None) for the dimensions of
|
||||
@@ -351,7 +370,7 @@ class GetImageDimensionsTests(unittest.TestCase):
|
||||
$ echo "123" > brokenimg.png
|
||||
"""
|
||||
img_path = os.path.join(os.path.dirname(__file__), "brokenimg.png")
|
||||
with open(img_path, 'rb') as fh:
|
||||
with open(img_path, "rb") as fh:
|
||||
size = images.get_image_dimensions(fh)
|
||||
self.assertEqual(size, (None, None))
|
||||
|
||||
@@ -364,19 +383,19 @@ class GetImageDimensionsTests(unittest.TestCase):
|
||||
attempt, the resulting image size should be invalid: (None, None).
|
||||
"""
|
||||
img_path = os.path.join(os.path.dirname(__file__), "test.png")
|
||||
with mock.patch('PIL.ImageFile.Parser.feed', side_effect=struct.error):
|
||||
with open(img_path, 'rb') as fh:
|
||||
with mock.patch("PIL.ImageFile.Parser.feed", side_effect=struct.error):
|
||||
with open(img_path, "rb") as fh:
|
||||
size = images.get_image_dimensions(fh)
|
||||
self.assertEqual(size, (None, None))
|
||||
|
||||
def test_missing_file(self):
|
||||
size = images.get_image_dimensions('missing.png')
|
||||
size = images.get_image_dimensions("missing.png")
|
||||
self.assertEqual(size, (None, None))
|
||||
|
||||
@unittest.skipUnless(HAS_WEBP, 'WEBP not installed')
|
||||
@unittest.skipUnless(HAS_WEBP, "WEBP not installed")
|
||||
def test_webp(self):
|
||||
img_path = os.path.join(os.path.dirname(__file__), 'test.webp')
|
||||
with open(img_path, 'rb') as fh:
|
||||
img_path = os.path.join(os.path.dirname(__file__), "test.webp")
|
||||
with open(img_path, "rb") as fh:
|
||||
size = images.get_image_dimensions(fh)
|
||||
self.assertEqual(size, (540, 405))
|
||||
|
||||
@@ -392,7 +411,9 @@ class FileMoveSafeTests(unittest.TestCase):
|
||||
file_move_safe(self.file_a, self.file_b, allow_overwrite=False)
|
||||
|
||||
# should allow it and continue on if allow_overwrite is True
|
||||
self.assertIsNone(file_move_safe(self.file_a, self.file_b, allow_overwrite=True))
|
||||
self.assertIsNone(
|
||||
file_move_safe(self.file_a, self.file_b, allow_overwrite=True)
|
||||
)
|
||||
|
||||
os.close(handle_a)
|
||||
os.close(handle_b)
|
||||
@@ -402,21 +423,27 @@ class FileMoveSafeTests(unittest.TestCase):
|
||||
file_move_safe() ignores a copystat() EPERM PermissionError. This
|
||||
happens when the destination filesystem is CIFS, for example.
|
||||
"""
|
||||
copystat_EACCES_error = PermissionError(errno.EACCES, 'msg')
|
||||
copystat_EPERM_error = PermissionError(errno.EPERM, 'msg')
|
||||
copystat_EACCES_error = PermissionError(errno.EACCES, "msg")
|
||||
copystat_EPERM_error = PermissionError(errno.EPERM, "msg")
|
||||
handle_a, self.file_a = tempfile.mkstemp()
|
||||
handle_b, self.file_b = tempfile.mkstemp()
|
||||
try:
|
||||
# This exception is required to reach the copystat() call in
|
||||
# file_safe_move().
|
||||
with mock.patch('django.core.files.move.os.rename', side_effect=OSError()):
|
||||
with mock.patch("django.core.files.move.os.rename", side_effect=OSError()):
|
||||
# An error besides EPERM isn't ignored.
|
||||
with mock.patch('django.core.files.move.copystat', side_effect=copystat_EACCES_error):
|
||||
with mock.patch(
|
||||
"django.core.files.move.copystat", side_effect=copystat_EACCES_error
|
||||
):
|
||||
with self.assertRaises(PermissionError):
|
||||
file_move_safe(self.file_a, self.file_b, allow_overwrite=True)
|
||||
# EPERM is ignored.
|
||||
with mock.patch('django.core.files.move.copystat', side_effect=copystat_EPERM_error):
|
||||
self.assertIsNone(file_move_safe(self.file_a, self.file_b, allow_overwrite=True))
|
||||
with mock.patch(
|
||||
"django.core.files.move.copystat", side_effect=copystat_EPERM_error
|
||||
):
|
||||
self.assertIsNone(
|
||||
file_move_safe(self.file_a, self.file_b, allow_overwrite=True)
|
||||
)
|
||||
finally:
|
||||
os.close(handle_a)
|
||||
os.close(handle_b)
|
||||
|
||||
Reference in New Issue
Block a user