mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-12-24 17:06:16 +03:00
Improve handling of file resources
Follow Python's file object semantics. User code is responsible for closing resources (usually through a context manager) in a deterministic way. To achieve this, remove __del__ functions. These functions used to closed open file handlers in an attempt to silence Python ResourceWarnings. However, using __del__ has the following drawbacks: - __del__ isn't called until the object's reference count reaches 0. Therefore, resource handlers remain open or in use longer than necessary. - The __del__ method isn't guaranteed to execute on system exit. See the Python documentation: https://docs.python.org/3/reference/datamodel.html#object.__del__ > It is not guaranteed that __del__() methods are called for objects > that still exist when the interpreter exits. - Exceptions that occur inside __del__ are ignored instead of raised. This has the potential of hiding bugs. This is also in the Python documentation: > Warning: Due to the precarious circumstances under which __del__() > methods are invoked, exceptions that occur during their execution > are ignored, and a warning is printed to sys.stderr instead. Instead, always close resource handlers when they are no longer in use. This will close the file handler at a specified point in the user's code and not wait until the interpreter chooses to. It is always guaranteed to run. And, if an exception occurs while closing the file handler, the bug will not be ignored. Now, when code receives a ResourceWarning, it will highlight an area that is mishandling resources. It should not simply be silenced, but fixed by closing resources with a context manager. All warnings that were emitted during tests have been cleaned up. To enable warnings, I passed the `-Wa` CLI option to Python. This exposed some mishandling of resources in ImageFile.__init__() and SpiderImagePlugin.loadImageSeries(), they too were fixed.
This commit is contained in:
parent
6595ce1609
commit
4cd4adddc3
|
@ -24,7 +24,7 @@ class TestBmpReference(PillowTestCase):
|
|||
|
||||
def open(f):
|
||||
try:
|
||||
im = Image.open(f)
|
||||
with Image.open(f) as im:
|
||||
im.load()
|
||||
except Exception: # as msg:
|
||||
pass
|
||||
|
@ -48,7 +48,7 @@ class TestBmpReference(PillowTestCase):
|
|||
]
|
||||
for f in self.get_files("q"):
|
||||
try:
|
||||
im = Image.open(f)
|
||||
with Image.open(f) as im:
|
||||
im.load()
|
||||
if os.path.basename(f) not in supported:
|
||||
print("Please add %s to the partially supported bmp specs." % f)
|
||||
|
@ -89,9 +89,9 @@ class TestBmpReference(PillowTestCase):
|
|||
|
||||
for f in self.get_files("g"):
|
||||
try:
|
||||
im = Image.open(f)
|
||||
with Image.open(f) as im:
|
||||
im.load()
|
||||
compare = Image.open(get_compare(f))
|
||||
with Image.open(get_compare(f)) as compare:
|
||||
compare.load()
|
||||
if im.mode == "P":
|
||||
# assert image similar doesn't really work
|
||||
|
|
|
@ -14,7 +14,8 @@ class TestDecompressionBomb(PillowTestCase):
|
|||
def test_no_warning_small_file(self):
|
||||
# Implicit assert: no warning.
|
||||
# A warning would cause a failure.
|
||||
Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE):
|
||||
pass
|
||||
|
||||
def test_no_warning_no_limit(self):
|
||||
# Arrange
|
||||
|
@ -25,21 +26,28 @@ class TestDecompressionBomb(PillowTestCase):
|
|||
# Act / Assert
|
||||
# Implicit assert: no warning.
|
||||
# A warning would cause a failure.
|
||||
Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE):
|
||||
pass
|
||||
|
||||
def test_warning(self):
|
||||
# Set limit to trigger warning on the test file
|
||||
Image.MAX_IMAGE_PIXELS = 128 * 128 - 1
|
||||
self.assertEqual(Image.MAX_IMAGE_PIXELS, 128 * 128 - 1)
|
||||
|
||||
self.assert_warning(Image.DecompressionBombWarning, Image.open, TEST_FILE)
|
||||
def open():
|
||||
with Image.open(TEST_FILE):
|
||||
pass
|
||||
|
||||
self.assert_warning(Image.DecompressionBombWarning, open)
|
||||
|
||||
def test_exception(self):
|
||||
# Set limit to trigger exception on the test file
|
||||
Image.MAX_IMAGE_PIXELS = 64 * 128 - 1
|
||||
self.assertEqual(Image.MAX_IMAGE_PIXELS, 64 * 128 - 1)
|
||||
|
||||
self.assertRaises(Image.DecompressionBombError, lambda: Image.open(TEST_FILE))
|
||||
with self.assertRaises(Image.DecompressionBombError):
|
||||
with Image.open(TEST_FILE):
|
||||
pass
|
||||
|
||||
def test_exception_ico(self):
|
||||
with self.assertRaises(Image.DecompressionBombError):
|
||||
|
@ -53,6 +61,7 @@ class TestDecompressionBomb(PillowTestCase):
|
|||
class TestDecompressionCrop(PillowTestCase):
|
||||
def setUp(self):
|
||||
self.src = hopper()
|
||||
self.addCleanup(self.src.close)
|
||||
Image.MAX_IMAGE_PIXELS = self.src.height * self.src.width * 4 - 1
|
||||
|
||||
def tearDown(self):
|
||||
|
|
|
@ -5,13 +5,13 @@ from .helper import PillowTestCase
|
|||
|
||||
class TestFileBlp(PillowTestCase):
|
||||
def test_load_blp2_raw(self):
|
||||
im = Image.open("Tests/images/blp/blp2_raw.blp")
|
||||
target = Image.open("Tests/images/blp/blp2_raw.png")
|
||||
with Image.open("Tests/images/blp/blp2_raw.blp") as im:
|
||||
with Image.open("Tests/images/blp/blp2_raw.png") as target:
|
||||
self.assert_image_equal(im, target)
|
||||
|
||||
def test_load_blp2_dxt1(self):
|
||||
im = Image.open("Tests/images/blp/blp2_dxt1.blp")
|
||||
target = Image.open("Tests/images/blp/blp2_dxt1.png")
|
||||
with Image.open("Tests/images/blp/blp2_dxt1.blp") as im:
|
||||
with Image.open("Tests/images/blp/blp2_dxt1.png") as target:
|
||||
self.assert_image_equal(im, target)
|
||||
|
||||
def test_load_blp2_dxt1a(self):
|
||||
|
|
|
@ -46,12 +46,11 @@ class TestFileBmp(PillowTestCase):
|
|||
dpi = (72, 72)
|
||||
|
||||
output = io.BytesIO()
|
||||
im = hopper()
|
||||
with hopper() as im:
|
||||
im.save(output, "BMP", dpi=dpi)
|
||||
|
||||
output.seek(0)
|
||||
reloaded = Image.open(output)
|
||||
|
||||
with Image.open(output) as reloaded:
|
||||
self.assertEqual(reloaded.info["dpi"], dpi)
|
||||
|
||||
def test_save_bmp_with_dpi(self):
|
||||
|
@ -72,11 +71,11 @@ class TestFileBmp(PillowTestCase):
|
|||
|
||||
def test_load_dpi_rounding(self):
|
||||
# Round up
|
||||
im = Image.open("Tests/images/hopper.bmp")
|
||||
with Image.open("Tests/images/hopper.bmp") as im:
|
||||
self.assertEqual(im.info["dpi"], (96, 96))
|
||||
|
||||
# Round down
|
||||
im = Image.open("Tests/images/hopper_roundDown.bmp")
|
||||
with Image.open("Tests/images/hopper_roundDown.bmp") as im:
|
||||
self.assertEqual(im.info["dpi"], (72, 72))
|
||||
|
||||
def test_save_dpi_rounding(self):
|
||||
|
@ -84,11 +83,11 @@ class TestFileBmp(PillowTestCase):
|
|||
im = Image.open("Tests/images/hopper.bmp")
|
||||
|
||||
im.save(outfile, dpi=(72.2, 72.2))
|
||||
reloaded = Image.open(outfile)
|
||||
with Image.open(outfile) as reloaded:
|
||||
self.assertEqual(reloaded.info["dpi"], (72, 72))
|
||||
|
||||
im.save(outfile, dpi=(72.8, 72.8))
|
||||
reloaded = Image.open(outfile)
|
||||
with Image.open(outfile) as reloaded:
|
||||
self.assertEqual(reloaded.info["dpi"], (73, 73))
|
||||
|
||||
def test_load_dib(self):
|
||||
|
|
|
@ -8,7 +8,7 @@ TEST_FILE = "Tests/images/gfs.t06z.rassda.tm00.bufr_d"
|
|||
class TestFileBufrStub(PillowTestCase):
|
||||
def test_open(self):
|
||||
# Act
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
# Assert
|
||||
self.assertEqual(im.format, "BUFR")
|
||||
|
@ -28,7 +28,7 @@ class TestFileBufrStub(PillowTestCase):
|
|||
|
||||
def test_load(self):
|
||||
# Arrange
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
# Act / Assert: stub cannot load without an implemented handler
|
||||
self.assertRaises(IOError, im.load)
|
||||
|
|
|
@ -11,7 +11,7 @@ class TestFileContainer(PillowTestCase):
|
|||
dir(ContainerIO)
|
||||
|
||||
def test_isatty(self):
|
||||
im = hopper()
|
||||
with hopper() as im:
|
||||
container = ContainerIO.ContainerIO(im, 0, 0)
|
||||
|
||||
self.assertFalse(container.isatty())
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
import unittest
|
||||
|
||||
from PIL import DcxImagePlugin, Image
|
||||
|
||||
from .helper import PillowTestCase, hopper
|
||||
from .helper import PillowTestCase, hopper, is_pypy
|
||||
|
||||
# Created with ImageMagick: convert hopper.ppm hopper.dcx
|
||||
TEST_FILE = "Tests/images/hopper.dcx"
|
||||
|
@ -11,7 +13,7 @@ class TestFileDcx(PillowTestCase):
|
|||
# Arrange
|
||||
|
||||
# Act
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
# Assert
|
||||
self.assertEqual(im.size, (128, 128))
|
||||
|
@ -19,11 +21,27 @@ class TestFileDcx(PillowTestCase):
|
|||
orig = hopper()
|
||||
self.assert_image_equal(im, orig)
|
||||
|
||||
@unittest.skipIf(is_pypy(), "Requires CPython")
|
||||
def test_unclosed_file(self):
|
||||
def open():
|
||||
im = Image.open(TEST_FILE)
|
||||
im.load()
|
||||
|
||||
self.assert_warning(ResourceWarning, open)
|
||||
|
||||
def test_closed_file(self):
|
||||
def open():
|
||||
im = Image.open(TEST_FILE)
|
||||
im.load()
|
||||
im.close()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_context_manager(self):
|
||||
def open():
|
||||
with Image.open(TEST_FILE) as im:
|
||||
im.load()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_invalid_file(self):
|
||||
|
@ -32,7 +50,7 @@ class TestFileDcx(PillowTestCase):
|
|||
|
||||
def test_tell(self):
|
||||
# Arrange
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
# Act
|
||||
frame = im.tell()
|
||||
|
@ -41,12 +59,12 @@ class TestFileDcx(PillowTestCase):
|
|||
self.assertEqual(frame, 0)
|
||||
|
||||
def test_n_frames(self):
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
self.assertEqual(im.n_frames, 1)
|
||||
self.assertFalse(im.is_animated)
|
||||
|
||||
def test_eoferror(self):
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
n_frames = im.n_frames
|
||||
|
||||
# Test seeking past the last frame
|
||||
|
@ -58,7 +76,7 @@ class TestFileDcx(PillowTestCase):
|
|||
|
||||
def test_seek_too_far(self):
|
||||
# Arrange
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
frame = 999 # too big on purpose
|
||||
|
||||
# Act / Assert
|
||||
|
|
|
@ -25,26 +25,26 @@ class TestFileEps(PillowTestCase):
|
|||
@unittest.skipUnless(HAS_GHOSTSCRIPT, "Ghostscript not available")
|
||||
def test_sanity(self):
|
||||
# Regular scale
|
||||
image1 = Image.open(file1)
|
||||
with Image.open(file1) as image1:
|
||||
image1.load()
|
||||
self.assertEqual(image1.mode, "RGB")
|
||||
self.assertEqual(image1.size, (460, 352))
|
||||
self.assertEqual(image1.format, "EPS")
|
||||
|
||||
image2 = Image.open(file2)
|
||||
with Image.open(file2) as image2:
|
||||
image2.load()
|
||||
self.assertEqual(image2.mode, "RGB")
|
||||
self.assertEqual(image2.size, (360, 252))
|
||||
self.assertEqual(image2.format, "EPS")
|
||||
|
||||
# Double scale
|
||||
image1_scale2 = Image.open(file1)
|
||||
with Image.open(file1) as image1_scale2:
|
||||
image1_scale2.load(scale=2)
|
||||
self.assertEqual(image1_scale2.mode, "RGB")
|
||||
self.assertEqual(image1_scale2.size, (920, 704))
|
||||
self.assertEqual(image1_scale2.format, "EPS")
|
||||
|
||||
image2_scale2 = Image.open(file2)
|
||||
with Image.open(file2) as image2_scale2:
|
||||
image2_scale2.load(scale=2)
|
||||
self.assertEqual(image2_scale2.mode, "RGB")
|
||||
self.assertEqual(image2_scale2.size, (720, 504))
|
||||
|
@ -57,7 +57,7 @@ class TestFileEps(PillowTestCase):
|
|||
|
||||
@unittest.skipUnless(HAS_GHOSTSCRIPT, "Ghostscript not available")
|
||||
def test_cmyk(self):
|
||||
cmyk_image = Image.open("Tests/images/pil_sample_cmyk.eps")
|
||||
with Image.open("Tests/images/pil_sample_cmyk.eps") as cmyk_image:
|
||||
|
||||
self.assertEqual(cmyk_image.mode, "CMYK")
|
||||
self.assertEqual(cmyk_image.size, (100, 100))
|
||||
|
@ -73,9 +73,8 @@ class TestFileEps(PillowTestCase):
|
|||
@unittest.skipUnless(HAS_GHOSTSCRIPT, "Ghostscript not available")
|
||||
def test_showpage(self):
|
||||
# See https://github.com/python-pillow/Pillow/issues/2615
|
||||
plot_image = Image.open("Tests/images/reqd_showpage.eps")
|
||||
target = Image.open("Tests/images/reqd_showpage.png")
|
||||
|
||||
with Image.open("Tests/images/reqd_showpage.eps") as plot_image:
|
||||
with Image.open("Tests/images/reqd_showpage.png") as target:
|
||||
# should not crash/hang
|
||||
plot_image.load()
|
||||
# fonts could be slightly different
|
||||
|
@ -84,14 +83,14 @@ class TestFileEps(PillowTestCase):
|
|||
@unittest.skipUnless(HAS_GHOSTSCRIPT, "Ghostscript not available")
|
||||
def test_file_object(self):
|
||||
# issue 479
|
||||
image1 = Image.open(file1)
|
||||
with Image.open(file1) as image1:
|
||||
with open(self.tempfile("temp_file.eps"), "wb") as fh:
|
||||
image1.save(fh, "EPS")
|
||||
|
||||
@unittest.skipUnless(HAS_GHOSTSCRIPT, "Ghostscript not available")
|
||||
def test_iobase_object(self):
|
||||
# issue 479
|
||||
image1 = Image.open(file1)
|
||||
with Image.open(file1) as image1:
|
||||
with io.open(self.tempfile("temp_iobase.eps"), "wb") as fh:
|
||||
image1.save(fh, "EPS")
|
||||
|
||||
|
@ -120,14 +119,14 @@ class TestFileEps(PillowTestCase):
|
|||
self.skipTest("zip/deflate support not available")
|
||||
|
||||
# Zero bounding box
|
||||
image1_scale1 = Image.open(file1)
|
||||
with Image.open(file1) as image1_scale1:
|
||||
image1_scale1.load()
|
||||
image1_scale1_compare = Image.open(file1_compare).convert("RGB")
|
||||
image1_scale1_compare.load()
|
||||
self.assert_image_similar(image1_scale1, image1_scale1_compare, 5)
|
||||
|
||||
# Non-Zero bounding box
|
||||
image2_scale1 = Image.open(file2)
|
||||
with Image.open(file2) as image2_scale1:
|
||||
image2_scale1.load()
|
||||
image2_scale1_compare = Image.open(file2_compare).convert("RGB")
|
||||
image2_scale1_compare.load()
|
||||
|
@ -141,14 +140,14 @@ class TestFileEps(PillowTestCase):
|
|||
self.skipTest("zip/deflate support not available")
|
||||
|
||||
# Zero bounding box
|
||||
image1_scale2 = Image.open(file1)
|
||||
with Image.open(file1) as image1_scale2:
|
||||
image1_scale2.load(scale=2)
|
||||
image1_scale2_compare = Image.open(file1_compare_scale2).convert("RGB")
|
||||
image1_scale2_compare.load()
|
||||
self.assert_image_similar(image1_scale2, image1_scale2_compare, 5)
|
||||
|
||||
# Non-Zero bounding box
|
||||
image2_scale2 = Image.open(file2)
|
||||
with Image.open(file2) as image2_scale2:
|
||||
image2_scale2.load(scale=2)
|
||||
image2_scale2_compare = Image.open(file2_compare_scale2).convert("RGB")
|
||||
image2_scale2_compare.load()
|
||||
|
@ -156,42 +155,29 @@ class TestFileEps(PillowTestCase):
|
|||
|
||||
@unittest.skipUnless(HAS_GHOSTSCRIPT, "Ghostscript not available")
|
||||
def test_resize(self):
|
||||
# Arrange
|
||||
image1 = Image.open(file1)
|
||||
image2 = Image.open(file2)
|
||||
image3 = Image.open("Tests/images/illu10_preview.eps")
|
||||
files = [file1, file2, "Tests/images/illu10_preview.eps"]
|
||||
for fn in files:
|
||||
with Image.open(fn) as im:
|
||||
new_size = (100, 100)
|
||||
|
||||
# Act
|
||||
image1 = image1.resize(new_size)
|
||||
image2 = image2.resize(new_size)
|
||||
image3 = image3.resize(new_size)
|
||||
|
||||
# Assert
|
||||
self.assertEqual(image1.size, new_size)
|
||||
self.assertEqual(image2.size, new_size)
|
||||
self.assertEqual(image3.size, new_size)
|
||||
im = im.resize(new_size)
|
||||
self.assertEqual(im.size, new_size)
|
||||
|
||||
@unittest.skipUnless(HAS_GHOSTSCRIPT, "Ghostscript not available")
|
||||
def test_thumbnail(self):
|
||||
# Issue #619
|
||||
# Arrange
|
||||
image1 = Image.open(file1)
|
||||
image2 = Image.open(file2)
|
||||
files = [file1, file2]
|
||||
for fn in files:
|
||||
with Image.open(file1) as im:
|
||||
new_size = (100, 100)
|
||||
|
||||
# Act
|
||||
image1.thumbnail(new_size)
|
||||
image2.thumbnail(new_size)
|
||||
|
||||
# Assert
|
||||
self.assertEqual(max(image1.size), max(new_size))
|
||||
self.assertEqual(max(image2.size), max(new_size))
|
||||
im.thumbnail(new_size)
|
||||
self.assertEqual(max(im.size), max(new_size))
|
||||
|
||||
def test_read_binary_preview(self):
|
||||
# Issue 302
|
||||
# open image with binary preview
|
||||
Image.open(file3)
|
||||
with Image.open(file3):
|
||||
pass
|
||||
|
||||
def _test_readline(self, t, ending):
|
||||
ending = "Failure with line ending: %s" % (
|
||||
|
@ -239,7 +225,7 @@ class TestFileEps(PillowTestCase):
|
|||
|
||||
# Act / Assert
|
||||
for filename in FILES:
|
||||
img = Image.open(filename)
|
||||
with Image.open(filename) as img:
|
||||
self.assertEqual(img.mode, "RGB")
|
||||
|
||||
@unittest.skipUnless(HAS_GHOSTSCRIPT, "Ghostscript not available")
|
||||
|
@ -247,7 +233,7 @@ class TestFileEps(PillowTestCase):
|
|||
# Test file includes an empty line in the header data
|
||||
emptyline_file = "Tests/images/zero_bb_emptyline.eps"
|
||||
|
||||
image = Image.open(emptyline_file)
|
||||
with Image.open(emptyline_file) as image:
|
||||
image.load()
|
||||
self.assertEqual(image.mode, "RGB")
|
||||
self.assertEqual(image.size, (460, 352))
|
||||
|
|
|
@ -8,7 +8,7 @@ TEST_FILE = "Tests/images/hopper.fits"
|
|||
class TestFileFitsStub(PillowTestCase):
|
||||
def test_open(self):
|
||||
# Act
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
# Assert
|
||||
self.assertEqual(im.format, "FITS")
|
||||
|
@ -28,14 +28,14 @@ class TestFileFitsStub(PillowTestCase):
|
|||
|
||||
def test_load(self):
|
||||
# Arrange
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
# Act / Assert: stub cannot load without an implemented handler
|
||||
self.assertRaises(IOError, im.load)
|
||||
|
||||
def test_save(self):
|
||||
# Arrange
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
dummy_fp = None
|
||||
dummy_filename = "dummy.filename"
|
||||
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
import unittest
|
||||
|
||||
from PIL import FliImagePlugin, Image
|
||||
|
||||
from .helper import PillowTestCase
|
||||
from .helper import PillowTestCase, is_pypy
|
||||
|
||||
# created as an export of a palette image from Gimp2.6
|
||||
# save as...-> hopper.fli, default options.
|
||||
|
@ -12,30 +14,46 @@ animated_test_file = "Tests/images/a.fli"
|
|||
|
||||
class TestFileFli(PillowTestCase):
|
||||
def test_sanity(self):
|
||||
im = Image.open(static_test_file)
|
||||
with Image.open(static_test_file) as im:
|
||||
im.load()
|
||||
self.assertEqual(im.mode, "P")
|
||||
self.assertEqual(im.size, (128, 128))
|
||||
self.assertEqual(im.format, "FLI")
|
||||
self.assertFalse(im.is_animated)
|
||||
|
||||
im = Image.open(animated_test_file)
|
||||
with Image.open(animated_test_file) as im:
|
||||
self.assertEqual(im.mode, "P")
|
||||
self.assertEqual(im.size, (320, 200))
|
||||
self.assertEqual(im.format, "FLI")
|
||||
self.assertEqual(im.info["duration"], 71)
|
||||
self.assertTrue(im.is_animated)
|
||||
|
||||
@unittest.skipIf(is_pypy(), "Requires CPython")
|
||||
def test_unclosed_file(self):
|
||||
def open():
|
||||
im = Image.open(static_test_file)
|
||||
im.load()
|
||||
|
||||
self.assert_warning(ResourceWarning, open)
|
||||
|
||||
def test_closed_file(self):
|
||||
def open():
|
||||
im = Image.open(static_test_file)
|
||||
im.load()
|
||||
im.close()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_context_manager(self):
|
||||
def open():
|
||||
with Image.open(static_test_file) as im:
|
||||
im.load()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_tell(self):
|
||||
# Arrange
|
||||
im = Image.open(static_test_file)
|
||||
with Image.open(static_test_file) as im:
|
||||
|
||||
# Act
|
||||
frame = im.tell()
|
||||
|
@ -49,16 +67,16 @@ class TestFileFli(PillowTestCase):
|
|||
self.assertRaises(SyntaxError, FliImagePlugin.FliImageFile, invalid_file)
|
||||
|
||||
def test_n_frames(self):
|
||||
im = Image.open(static_test_file)
|
||||
with Image.open(static_test_file) as im:
|
||||
self.assertEqual(im.n_frames, 1)
|
||||
self.assertFalse(im.is_animated)
|
||||
|
||||
im = Image.open(animated_test_file)
|
||||
with Image.open(animated_test_file) as im:
|
||||
self.assertEqual(im.n_frames, 384)
|
||||
self.assertTrue(im.is_animated)
|
||||
|
||||
def test_eoferror(self):
|
||||
im = Image.open(animated_test_file)
|
||||
with Image.open(animated_test_file) as im:
|
||||
n_frames = im.n_frames
|
||||
|
||||
# Test seeking past the last frame
|
||||
|
@ -69,7 +87,7 @@ class TestFileFli(PillowTestCase):
|
|||
im.seek(n_frames - 1)
|
||||
|
||||
def test_seek_tell(self):
|
||||
im = Image.open(animated_test_file)
|
||||
with Image.open(animated_test_file) as im:
|
||||
|
||||
layer_number = im.tell()
|
||||
self.assertEqual(layer_number, 0)
|
||||
|
@ -91,8 +109,8 @@ class TestFileFli(PillowTestCase):
|
|||
self.assertEqual(layer_number, 1)
|
||||
|
||||
def test_seek(self):
|
||||
im = Image.open(animated_test_file)
|
||||
with Image.open(animated_test_file) as im:
|
||||
im.seek(50)
|
||||
|
||||
expected = Image.open("Tests/images/a_fli.png")
|
||||
with Image.open("Tests/images/a_fli.png") as expected:
|
||||
self.assert_image_equal(im, expected)
|
||||
|
|
|
@ -10,8 +10,6 @@ class TestFileGbr(PillowTestCase):
|
|||
self.assertRaises(SyntaxError, GbrImagePlugin.GbrImageFile, invalid_file)
|
||||
|
||||
def test_gbr_file(self):
|
||||
im = Image.open("Tests/images/gbr.gbr")
|
||||
|
||||
target = Image.open("Tests/images/gbr.png")
|
||||
|
||||
with Image.open("Tests/images/gbr.gbr") as im:
|
||||
with Image.open("Tests/images/gbr.png") as target:
|
||||
self.assert_image_equal(target, im)
|
||||
|
|
|
@ -7,7 +7,7 @@ TEST_GD_FILE = "Tests/images/hopper.gd"
|
|||
|
||||
class TestFileGd(PillowTestCase):
|
||||
def test_sanity(self):
|
||||
im = GdImageFile.open(TEST_GD_FILE)
|
||||
with GdImageFile.open(TEST_GD_FILE) as im:
|
||||
self.assertEqual(im.size, (128, 128))
|
||||
self.assertEqual(im.format, "GD")
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ from io import BytesIO
|
|||
|
||||
from PIL import GifImagePlugin, Image, ImageDraw, ImagePalette
|
||||
|
||||
from .helper import PillowTestCase, hopper, netpbm_available, unittest
|
||||
from .helper import PillowTestCase, hopper, is_pypy, netpbm_available, unittest
|
||||
|
||||
try:
|
||||
from PIL import _webp
|
||||
|
@ -26,18 +26,34 @@ class TestFileGif(PillowTestCase):
|
|||
self.skipTest("gif support not available") # can this happen?
|
||||
|
||||
def test_sanity(self):
|
||||
im = Image.open(TEST_GIF)
|
||||
with Image.open(TEST_GIF) as im:
|
||||
im.load()
|
||||
self.assertEqual(im.mode, "P")
|
||||
self.assertEqual(im.size, (128, 128))
|
||||
self.assertEqual(im.format, "GIF")
|
||||
self.assertEqual(im.info["version"], b"GIF89a")
|
||||
|
||||
@unittest.skipIf(is_pypy(), "Requires CPython")
|
||||
def test_unclosed_file(self):
|
||||
def open():
|
||||
im = Image.open(TEST_GIF)
|
||||
im.load()
|
||||
|
||||
self.assert_warning(ResourceWarning, open)
|
||||
|
||||
def test_closed_file(self):
|
||||
def open():
|
||||
im = Image.open(TEST_GIF)
|
||||
im.load()
|
||||
im.close()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_context_manager(self):
|
||||
def open():
|
||||
with Image.open(TEST_GIF) as im:
|
||||
im.load()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_invalid_file(self):
|
||||
|
@ -112,17 +128,17 @@ class TestFileGif(PillowTestCase):
|
|||
out = self.tempfile("temp.gif")
|
||||
im = hopper()
|
||||
im.save(out)
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
|
||||
self.assert_image_similar(reread.convert("RGB"), im, 50)
|
||||
|
||||
def test_roundtrip2(self):
|
||||
# see https://github.com/python-pillow/Pillow/issues/403
|
||||
out = self.tempfile("temp.gif")
|
||||
im = Image.open(TEST_GIF)
|
||||
with Image.open(TEST_GIF) as im:
|
||||
im2 = im.copy()
|
||||
im2.save(out)
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
|
||||
self.assert_image_similar(reread.convert("RGB"), hopper(), 50)
|
||||
|
||||
|
@ -131,29 +147,29 @@ class TestFileGif(PillowTestCase):
|
|||
out = self.tempfile("temp.gif")
|
||||
im = hopper()
|
||||
im.save(out, save_all=True)
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
|
||||
self.assert_image_similar(reread.convert("RGB"), im, 50)
|
||||
|
||||
# Multiframe image
|
||||
im = Image.open("Tests/images/dispose_bgnd.gif")
|
||||
with Image.open("Tests/images/dispose_bgnd.gif") as im:
|
||||
|
||||
out = self.tempfile("temp.gif")
|
||||
im.save(out, save_all=True)
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
|
||||
self.assertEqual(reread.n_frames, 5)
|
||||
|
||||
def test_headers_saving_for_animated_gifs(self):
|
||||
important_headers = ["background", "version", "duration", "loop"]
|
||||
# Multiframe image
|
||||
im = Image.open("Tests/images/dispose_bgnd.gif")
|
||||
with Image.open("Tests/images/dispose_bgnd.gif") as im:
|
||||
|
||||
info = im.info.copy()
|
||||
|
||||
out = self.tempfile("temp.gif")
|
||||
im.save(out, save_all=True)
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
|
||||
for header in important_headers:
|
||||
self.assertEqual(info[header], reread.info[header])
|
||||
|
@ -161,7 +177,7 @@ class TestFileGif(PillowTestCase):
|
|||
def test_palette_handling(self):
|
||||
# see https://github.com/python-pillow/Pillow/issues/513
|
||||
|
||||
im = Image.open(TEST_GIF)
|
||||
with Image.open(TEST_GIF) as im:
|
||||
im = im.convert("RGB")
|
||||
|
||||
im = im.resize((100, 100), Image.LANCZOS)
|
||||
|
@ -170,7 +186,7 @@ class TestFileGif(PillowTestCase):
|
|||
f = self.tempfile("temp.gif")
|
||||
im2.save(f, optimize=True)
|
||||
|
||||
reloaded = Image.open(f)
|
||||
with Image.open(f) as reloaded:
|
||||
|
||||
self.assert_image_similar(im, reloaded.convert("RGB"), 10)
|
||||
|
||||
|
@ -185,34 +201,41 @@ class TestFileGif(PillowTestCase):
|
|||
return reloaded
|
||||
|
||||
orig = "Tests/images/test.colors.gif"
|
||||
im = Image.open(orig)
|
||||
with Image.open(orig) as im:
|
||||
|
||||
self.assert_image_similar(im, roundtrip(im), 1)
|
||||
self.assert_image_similar(im, roundtrip(im, optimize=True), 1)
|
||||
with roundtrip(im) as reloaded:
|
||||
self.assert_image_similar(im, reloaded, 1)
|
||||
with roundtrip(im, optimize=True) as reloaded:
|
||||
self.assert_image_similar(im, reloaded, 1)
|
||||
|
||||
im = im.convert("RGB")
|
||||
# check automatic P conversion
|
||||
reloaded = roundtrip(im).convert("RGB")
|
||||
with roundtrip(im) as reloaded:
|
||||
reloaded = reloaded.convert("RGB")
|
||||
self.assert_image_equal(im, reloaded)
|
||||
|
||||
@unittest.skipUnless(netpbm_available(), "netpbm not available")
|
||||
def test_save_netpbm_bmp_mode(self):
|
||||
img = Image.open(TEST_GIF).convert("RGB")
|
||||
with Image.open(TEST_GIF) as img:
|
||||
img = img.convert("RGB")
|
||||
|
||||
tempfile = self.tempfile("temp.gif")
|
||||
GifImagePlugin._save_netpbm(img, 0, tempfile)
|
||||
self.assert_image_similar(img, Image.open(tempfile).convert("RGB"), 0)
|
||||
with Image.open(tempfile) as reloaded:
|
||||
self.assert_image_similar(img, reloaded.convert("RGB"), 0)
|
||||
|
||||
@unittest.skipUnless(netpbm_available(), "netpbm not available")
|
||||
def test_save_netpbm_l_mode(self):
|
||||
img = Image.open(TEST_GIF).convert("L")
|
||||
with Image.open(TEST_GIF) as img:
|
||||
img = img.convert("L")
|
||||
|
||||
tempfile = self.tempfile("temp.gif")
|
||||
GifImagePlugin._save_netpbm(img, 0, tempfile)
|
||||
self.assert_image_similar(img, Image.open(tempfile).convert("L"), 0)
|
||||
with Image.open(tempfile) as reloaded:
|
||||
self.assert_image_similar(img, reloaded.convert("L"), 0)
|
||||
|
||||
def test_seek(self):
|
||||
img = Image.open("Tests/images/dispose_none.gif")
|
||||
with Image.open("Tests/images/dispose_none.gif") as img:
|
||||
framecount = 0
|
||||
try:
|
||||
while True:
|
||||
|
@ -222,7 +245,7 @@ class TestFileGif(PillowTestCase):
|
|||
self.assertEqual(framecount, 5)
|
||||
|
||||
def test_seek_info(self):
|
||||
im = Image.open("Tests/images/iss634.gif")
|
||||
with Image.open("Tests/images/iss634.gif") as im:
|
||||
info = im.info.copy()
|
||||
|
||||
im.seek(1)
|
||||
|
@ -231,27 +254,27 @@ class TestFileGif(PillowTestCase):
|
|||
self.assertEqual(im.info, info)
|
||||
|
||||
def test_seek_rewind(self):
|
||||
im = Image.open("Tests/images/iss634.gif")
|
||||
with Image.open("Tests/images/iss634.gif") as im:
|
||||
im.seek(2)
|
||||
im.seek(1)
|
||||
|
||||
expected = Image.open("Tests/images/iss634.gif")
|
||||
with Image.open("Tests/images/iss634.gif") as expected:
|
||||
expected.seek(1)
|
||||
self.assert_image_equal(im, expected)
|
||||
|
||||
def test_n_frames(self):
|
||||
for path, n_frames in [[TEST_GIF, 1], ["Tests/images/iss634.gif", 42]]:
|
||||
# Test is_animated before n_frames
|
||||
im = Image.open(path)
|
||||
with Image.open(path) as im:
|
||||
self.assertEqual(im.is_animated, n_frames != 1)
|
||||
|
||||
# Test is_animated after n_frames
|
||||
im = Image.open(path)
|
||||
with Image.open(path) as im:
|
||||
self.assertEqual(im.n_frames, n_frames)
|
||||
self.assertEqual(im.is_animated, n_frames != 1)
|
||||
|
||||
def test_eoferror(self):
|
||||
im = Image.open(TEST_GIF)
|
||||
with Image.open(TEST_GIF) as im:
|
||||
n_frames = im.n_frames
|
||||
|
||||
# Test seeking past the last frame
|
||||
|
@ -262,7 +285,7 @@ class TestFileGif(PillowTestCase):
|
|||
im.seek(n_frames - 1)
|
||||
|
||||
def test_dispose_none(self):
|
||||
img = Image.open("Tests/images/dispose_none.gif")
|
||||
with Image.open("Tests/images/dispose_none.gif") as img:
|
||||
try:
|
||||
while True:
|
||||
img.seek(img.tell() + 1)
|
||||
|
@ -271,7 +294,7 @@ class TestFileGif(PillowTestCase):
|
|||
pass
|
||||
|
||||
def test_dispose_background(self):
|
||||
img = Image.open("Tests/images/dispose_bgnd.gif")
|
||||
with Image.open("Tests/images/dispose_bgnd.gif") as img:
|
||||
try:
|
||||
while True:
|
||||
img.seek(img.tell() + 1)
|
||||
|
@ -280,7 +303,7 @@ class TestFileGif(PillowTestCase):
|
|||
pass
|
||||
|
||||
def test_dispose_previous(self):
|
||||
img = Image.open("Tests/images/dispose_prev.gif")
|
||||
with Image.open("Tests/images/dispose_prev.gif") as img:
|
||||
try:
|
||||
while True:
|
||||
img.seek(img.tell() + 1)
|
||||
|
@ -299,7 +322,7 @@ class TestFileGif(PillowTestCase):
|
|||
im_list[0].save(
|
||||
out, save_all=True, append_images=im_list[1:], disposal=method
|
||||
)
|
||||
img = Image.open(out)
|
||||
with Image.open(out) as img:
|
||||
for _ in range(2):
|
||||
img.seek(img.tell() + 1)
|
||||
self.assertEqual(img.disposal_method, method)
|
||||
|
@ -312,7 +335,7 @@ class TestFileGif(PillowTestCase):
|
|||
disposal=tuple(range(len(im_list))),
|
||||
)
|
||||
|
||||
img = Image.open(out)
|
||||
with Image.open(out) as img:
|
||||
|
||||
for i in range(2):
|
||||
img.seek(img.tell() + 1)
|
||||
|
@ -336,8 +359,7 @@ class TestFileGif(PillowTestCase):
|
|||
|
||||
im_list[0].save(out, save_all=True, append_images=im_list[1:], disposal=2)
|
||||
|
||||
img = Image.open(out)
|
||||
|
||||
with Image.open(out) as img:
|
||||
for i, circle in enumerate(circles):
|
||||
img.seek(i)
|
||||
rgb_img = img.convert("RGB")
|
||||
|
@ -375,8 +397,7 @@ class TestFileGif(PillowTestCase):
|
|||
out, save_all=True, append_images=im_list[1:], disposal=2, transparency=0
|
||||
)
|
||||
|
||||
img = Image.open(out)
|
||||
|
||||
with Image.open(out) as img:
|
||||
for i, colours in enumerate(circles):
|
||||
img.seek(i)
|
||||
rgb_img = img.convert("RGBA")
|
||||
|
@ -411,12 +432,12 @@ class TestFileGif(PillowTestCase):
|
|||
out, save_all=True, append_images=im_list[1:], disposal=[0, 2], background=1
|
||||
)
|
||||
|
||||
im = Image.open(out)
|
||||
with Image.open(out) as im:
|
||||
im.seek(1)
|
||||
self.assertEqual(im.getpixel((0, 0)), 0)
|
||||
|
||||
def test_iss634(self):
|
||||
img = Image.open("Tests/images/iss634.gif")
|
||||
with Image.open("Tests/images/iss634.gif") as img:
|
||||
# seek to the second frame
|
||||
img.seek(img.tell() + 1)
|
||||
# all transparent pixels should be replaced with the color from the
|
||||
|
@ -433,7 +454,7 @@ class TestFileGif(PillowTestCase):
|
|||
im.info["duration"] = 100
|
||||
im.save(out, duration=duration)
|
||||
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
self.assertEqual(reread.info["duration"], duration)
|
||||
|
||||
def test_multiple_duration(self):
|
||||
|
@ -450,7 +471,7 @@ class TestFileGif(PillowTestCase):
|
|||
im_list[0].save(
|
||||
out, save_all=True, append_images=im_list[1:], duration=duration_list
|
||||
)
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
|
||||
for duration in duration_list:
|
||||
self.assertEqual(reread.info["duration"], duration)
|
||||
|
@ -463,7 +484,7 @@ class TestFileGif(PillowTestCase):
|
|||
im_list[0].save(
|
||||
out, save_all=True, append_images=im_list[1:], duration=tuple(duration_list)
|
||||
)
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
|
||||
for duration in duration_list:
|
||||
self.assertEqual(reread.info["duration"], duration)
|
||||
|
@ -487,7 +508,7 @@ class TestFileGif(PillowTestCase):
|
|||
im_list[0].save(
|
||||
out, save_all=True, append_images=im_list[1:], duration=duration_list
|
||||
)
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
|
||||
# Assert that the first three frames were combined
|
||||
self.assertEqual(reread.n_frames, 2)
|
||||
|
@ -507,8 +528,7 @@ class TestFileGif(PillowTestCase):
|
|||
im_list[0].save(
|
||||
out, save_all=True, append_images=im_list[1:], duration=duration
|
||||
)
|
||||
reread = Image.open(out)
|
||||
|
||||
with Image.open(out) as reread:
|
||||
# Assert that all frames were combined
|
||||
self.assertEqual(reread.n_frames, 1)
|
||||
|
||||
|
@ -521,7 +541,7 @@ class TestFileGif(PillowTestCase):
|
|||
out = self.tempfile("temp.gif")
|
||||
im = Image.new("L", (100, 100), "#000")
|
||||
im.save(out, loop=number_of_loops)
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
|
||||
self.assertEqual(reread.info["loop"], number_of_loops)
|
||||
|
||||
|
@ -530,7 +550,7 @@ class TestFileGif(PillowTestCase):
|
|||
im = Image.new("L", (100, 100), "#000")
|
||||
im.info["background"] = 1
|
||||
im.save(out)
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
|
||||
self.assertEqual(reread.info["background"], im.info["background"])
|
||||
|
||||
|
@ -540,14 +560,16 @@ class TestFileGif(PillowTestCase):
|
|||
im.save(out)
|
||||
|
||||
def test_comment(self):
|
||||
im = Image.open(TEST_GIF)
|
||||
self.assertEqual(im.info["comment"], b"File written by Adobe Photoshop\xa8 4.0")
|
||||
with Image.open(TEST_GIF) as im:
|
||||
self.assertEqual(
|
||||
im.info["comment"], b"File written by Adobe Photoshop\xa8 4.0"
|
||||
)
|
||||
|
||||
out = self.tempfile("temp.gif")
|
||||
im = Image.new("L", (100, 100), "#000")
|
||||
im.info["comment"] = b"Test comment text"
|
||||
im.save(out)
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
|
||||
self.assertEqual(reread.info["comment"], im.info["comment"])
|
||||
|
||||
|
@ -559,13 +581,13 @@ class TestFileGif(PillowTestCase):
|
|||
comment += comment
|
||||
im.info["comment"] = comment
|
||||
im.save(out)
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
|
||||
self.assertEqual(reread.info["comment"], comment)
|
||||
|
||||
def test_zero_comment_subblocks(self):
|
||||
im = Image.open("Tests/images/hopper_zero_comment_subblocks.gif")
|
||||
expected = Image.open(TEST_GIF)
|
||||
with Image.open("Tests/images/hopper_zero_comment_subblocks.gif") as im:
|
||||
with Image.open(TEST_GIF) as expected:
|
||||
self.assert_image_equal(im, expected)
|
||||
|
||||
def test_version(self):
|
||||
|
@ -573,7 +595,7 @@ class TestFileGif(PillowTestCase):
|
|||
|
||||
def assertVersionAfterSave(im, version):
|
||||
im.save(out)
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
self.assertEqual(reread.info["version"], version)
|
||||
|
||||
# Test that GIF87a is used by default
|
||||
|
@ -590,7 +612,7 @@ class TestFileGif(PillowTestCase):
|
|||
assertVersionAfterSave(im, b"GIF89a")
|
||||
|
||||
# Test that a GIF87a image is also saved in that format
|
||||
im = Image.open("Tests/images/test.colors.gif")
|
||||
with Image.open("Tests/images/test.colors.gif") as im:
|
||||
assertVersionAfterSave(im, b"GIF87a")
|
||||
|
||||
# Test that a GIF89a image is also saved in that format
|
||||
|
@ -605,7 +627,7 @@ class TestFileGif(PillowTestCase):
|
|||
ims = [Image.new("RGB", (100, 100), color) for color in ["#0f0", "#00f"]]
|
||||
im.copy().save(out, save_all=True, append_images=ims)
|
||||
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
self.assertEqual(reread.n_frames, 3)
|
||||
|
||||
# Tests appending using a generator
|
||||
|
@ -615,15 +637,15 @@ class TestFileGif(PillowTestCase):
|
|||
|
||||
im.save(out, save_all=True, append_images=imGenerator(ims))
|
||||
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
self.assertEqual(reread.n_frames, 3)
|
||||
|
||||
# Tests appending single and multiple frame images
|
||||
im = Image.open("Tests/images/dispose_none.gif")
|
||||
ims = [Image.open("Tests/images/dispose_prev.gif")]
|
||||
im.save(out, save_all=True, append_images=ims)
|
||||
with Image.open("Tests/images/dispose_none.gif") as im:
|
||||
with Image.open("Tests/images/dispose_prev.gif") as im2:
|
||||
im.save(out, save_all=True, append_images=[im2])
|
||||
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
self.assertEqual(reread.n_frames, 10)
|
||||
|
||||
def test_transparent_optimize(self):
|
||||
|
@ -642,7 +664,7 @@ class TestFileGif(PillowTestCase):
|
|||
|
||||
out = self.tempfile("temp.gif")
|
||||
im.save(out, transparency=253)
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
|
||||
self.assertEqual(reloaded.info["transparency"], 253)
|
||||
|
||||
|
@ -654,7 +676,7 @@ class TestFileGif(PillowTestCase):
|
|||
im.info["transparency"] = (255, 0, 0)
|
||||
self.assert_warning(UserWarning, im.save, out)
|
||||
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
self.assertNotIn("transparency", reloaded.info)
|
||||
|
||||
# Multiple frames
|
||||
|
@ -663,7 +685,7 @@ class TestFileGif(PillowTestCase):
|
|||
ims = [Image.new("RGB", (1, 1))]
|
||||
self.assert_warning(UserWarning, im.save, out, save_all=True, append_images=ims)
|
||||
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
self.assertNotIn("transparency", reloaded.info)
|
||||
|
||||
def test_bbox(self):
|
||||
|
@ -673,7 +695,7 @@ class TestFileGif(PillowTestCase):
|
|||
ims = [Image.new("RGB", (100, 100), "#000")]
|
||||
im.save(out, save_all=True, append_images=ims)
|
||||
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
self.assertEqual(reread.n_frames, 2)
|
||||
|
||||
def test_palette_save_L(self):
|
||||
|
@ -686,7 +708,7 @@ class TestFileGif(PillowTestCase):
|
|||
out = self.tempfile("temp.gif")
|
||||
im_l.save(out, palette=palette)
|
||||
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
|
||||
self.assert_image_equal(reloaded.convert("RGB"), im.convert("RGB"))
|
||||
|
||||
|
@ -701,7 +723,7 @@ class TestFileGif(PillowTestCase):
|
|||
out = self.tempfile("temp.gif")
|
||||
im.save(out, palette=palette)
|
||||
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
im.putpalette(palette)
|
||||
self.assert_image_equal(reloaded, im)
|
||||
|
||||
|
@ -715,7 +737,7 @@ class TestFileGif(PillowTestCase):
|
|||
out = self.tempfile("temp.gif")
|
||||
im.save(out, palette=palette)
|
||||
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
im.putpalette(palette)
|
||||
self.assert_image_equal(reloaded, im)
|
||||
|
||||
|
@ -727,7 +749,7 @@ class TestFileGif(PillowTestCase):
|
|||
out = self.tempfile("temp.gif")
|
||||
im.save(out)
|
||||
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
self.assert_image_equal(reloaded.convert("L"), im.convert("L"))
|
||||
|
||||
def test_getdata(self):
|
||||
|
@ -759,14 +781,13 @@ class TestFileGif(PillowTestCase):
|
|||
|
||||
def test_lzw_bits(self):
|
||||
# see https://github.com/python-pillow/Pillow/issues/2811
|
||||
im = Image.open("Tests/images/issue_2811.gif")
|
||||
|
||||
with Image.open("Tests/images/issue_2811.gif") as im:
|
||||
self.assertEqual(im.tile[0][3][0], 11) # LZW bits
|
||||
# codec error prepatch
|
||||
im.load()
|
||||
|
||||
def test_extents(self):
|
||||
im = Image.open("Tests/images/test_extents.gif")
|
||||
with Image.open("Tests/images/test_extents.gif") as im:
|
||||
self.assertEqual(im.size, (100, 100))
|
||||
im.seek(1)
|
||||
self.assertEqual(im.size, (150, 150))
|
||||
|
|
|
@ -8,7 +8,7 @@ TEST_FILE = "Tests/images/WAlaska.wind.7days.grb"
|
|||
class TestFileGribStub(PillowTestCase):
|
||||
def test_open(self):
|
||||
# Act
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
# Assert
|
||||
self.assertEqual(im.format, "GRIB")
|
||||
|
@ -28,7 +28,7 @@ class TestFileGribStub(PillowTestCase):
|
|||
|
||||
def test_load(self):
|
||||
# Arrange
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
# Act / Assert: stub cannot load without an implemented handler
|
||||
self.assertRaises(IOError, im.load)
|
||||
|
|
|
@ -8,7 +8,7 @@ TEST_FILE = "Tests/images/hdf5.h5"
|
|||
class TestFileHdf5Stub(PillowTestCase):
|
||||
def test_open(self):
|
||||
# Act
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
# Assert
|
||||
self.assertEqual(im.format, "HDF5")
|
||||
|
@ -28,14 +28,14 @@ class TestFileHdf5Stub(PillowTestCase):
|
|||
|
||||
def test_load(self):
|
||||
# Arrange
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
# Act / Assert: stub cannot load without an implemented handler
|
||||
self.assertRaises(IOError, im.load)
|
||||
|
||||
def test_save(self):
|
||||
# Arrange
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
dummy_fp = None
|
||||
dummy_filename = "dummy.filename"
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ class TestFileIcns(PillowTestCase):
|
|||
def test_sanity(self):
|
||||
# Loading this icon by default should result in the largest size
|
||||
# (512x512@2x) being loaded
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
# Assert that there is no unclosed file warning
|
||||
self.assert_warning(None, im.load)
|
||||
|
@ -56,7 +56,7 @@ class TestFileIcns(PillowTestCase):
|
|||
def test_sizes(self):
|
||||
# Check that we can load all of the sizes, and that the final pixel
|
||||
# dimensions are as expected
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
for w, h, r in im.info["sizes"]:
|
||||
wr = w * r
|
||||
hr = h * r
|
||||
|
@ -72,11 +72,11 @@ class TestFileIcns(PillowTestCase):
|
|||
def test_older_icon(self):
|
||||
# This icon was made with Icon Composer rather than iconutil; it still
|
||||
# uses PNG rather than JP2, however (since it was made on 10.9).
|
||||
im = Image.open("Tests/images/pillow2.icns")
|
||||
with Image.open("Tests/images/pillow2.icns") as im:
|
||||
for w, h, r in im.info["sizes"]:
|
||||
wr = w * r
|
||||
hr = h * r
|
||||
im2 = Image.open("Tests/images/pillow2.icns")
|
||||
with Image.open("Tests/images/pillow2.icns") as im2:
|
||||
im2.size = (w, h, r)
|
||||
im2.load()
|
||||
self.assertEqual(im2.mode, "RGBA")
|
||||
|
@ -93,11 +93,11 @@ class TestFileIcns(PillowTestCase):
|
|||
if not enable_jpeg2k:
|
||||
return
|
||||
|
||||
im = Image.open("Tests/images/pillow3.icns")
|
||||
with Image.open("Tests/images/pillow3.icns") as im:
|
||||
for w, h, r in im.info["sizes"]:
|
||||
wr = w * r
|
||||
hr = h * r
|
||||
im2 = Image.open("Tests/images/pillow3.icns")
|
||||
with Image.open("Tests/images/pillow3.icns") as im2:
|
||||
im2.size = (w, h, r)
|
||||
im2.load()
|
||||
self.assertEqual(im2.mode, "RGBA")
|
||||
|
|
|
@ -9,7 +9,7 @@ TEST_ICO_FILE = "Tests/images/hopper.ico"
|
|||
|
||||
class TestFileIco(PillowTestCase):
|
||||
def test_sanity(self):
|
||||
im = Image.open(TEST_ICO_FILE)
|
||||
with Image.open(TEST_ICO_FILE) as im:
|
||||
im.load()
|
||||
self.assertEqual(im.mode, "RGBA")
|
||||
self.assertEqual(im.size, (16, 16))
|
||||
|
@ -46,19 +46,19 @@ class TestFileIco(PillowTestCase):
|
|||
self.assert_image_equal(reloaded, hopper().resize((32, 32), Image.LANCZOS))
|
||||
|
||||
def test_incorrect_size(self):
|
||||
im = Image.open(TEST_ICO_FILE)
|
||||
with Image.open(TEST_ICO_FILE) as im:
|
||||
with self.assertRaises(ValueError):
|
||||
im.size = (1, 1)
|
||||
|
||||
def test_save_256x256(self):
|
||||
"""Issue #2264 https://github.com/python-pillow/Pillow/issues/2264"""
|
||||
# Arrange
|
||||
im = Image.open("Tests/images/hopper_256x256.ico")
|
||||
with Image.open("Tests/images/hopper_256x256.ico") as im:
|
||||
outfile = self.tempfile("temp_saved_hopper_256x256.ico")
|
||||
|
||||
# Act
|
||||
im.save(outfile)
|
||||
im_saved = Image.open(outfile)
|
||||
with Image.open(outfile) as im_saved:
|
||||
|
||||
# Assert
|
||||
self.assertEqual(im_saved.size, (256, 256))
|
||||
|
@ -69,13 +69,12 @@ class TestFileIco(PillowTestCase):
|
|||
and not in 16x16, 24x24, 32x32, 48x48, 48x48, 48x48, 48x48 sizes
|
||||
"""
|
||||
# Arrange
|
||||
im = Image.open("Tests/images/python.ico") # 16x16, 32x32, 48x48
|
||||
with Image.open("Tests/images/python.ico") as im: # 16x16, 32x32, 48x48
|
||||
outfile = self.tempfile("temp_saved_python.ico")
|
||||
|
||||
# Act
|
||||
im.save(outfile)
|
||||
im_saved = Image.open(outfile)
|
||||
|
||||
with Image.open(outfile) as im_saved:
|
||||
# Assert
|
||||
self.assertEqual(
|
||||
im_saved.info["sizes"], {(16, 16), (24, 24), (32, 32), (48, 48)}
|
||||
|
@ -84,20 +83,21 @@ class TestFileIco(PillowTestCase):
|
|||
def test_unexpected_size(self):
|
||||
# This image has been manually hexedited to state that it is 16x32
|
||||
# while the image within is still 16x16
|
||||
im = self.assert_warning(
|
||||
UserWarning, Image.open, "Tests/images/hopper_unexpected.ico"
|
||||
)
|
||||
def open():
|
||||
with Image.open("Tests/images/hopper_unexpected.ico") as im:
|
||||
self.assertEqual(im.size, (16, 16))
|
||||
|
||||
self.assert_warning(UserWarning, open)
|
||||
|
||||
def test_draw_reloaded(self):
|
||||
im = Image.open(TEST_ICO_FILE)
|
||||
with Image.open(TEST_ICO_FILE) as im:
|
||||
outfile = self.tempfile("temp_saved_hopper_draw.ico")
|
||||
|
||||
draw = ImageDraw.Draw(im)
|
||||
draw.line((0, 0) + im.size, "#f00")
|
||||
im.save(outfile)
|
||||
|
||||
im = Image.open(outfile)
|
||||
with Image.open(outfile) as im:
|
||||
im.save("Tests/images/hopper_draw.ico")
|
||||
reloaded = Image.open("Tests/images/hopper_draw.ico")
|
||||
with Image.open("Tests/images/hopper_draw.ico") as reloaded:
|
||||
self.assert_image_equal(im, reloaded)
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
import unittest
|
||||
|
||||
from PIL import Image, ImImagePlugin
|
||||
|
||||
from .helper import PillowTestCase, hopper
|
||||
from .helper import PillowTestCase, hopper, is_pypy
|
||||
|
||||
# sample im
|
||||
TEST_IM = "Tests/images/hopper.im"
|
||||
|
@ -8,22 +10,38 @@ TEST_IM = "Tests/images/hopper.im"
|
|||
|
||||
class TestFileIm(PillowTestCase):
|
||||
def test_sanity(self):
|
||||
im = Image.open(TEST_IM)
|
||||
with Image.open(TEST_IM) as im:
|
||||
im.load()
|
||||
self.assertEqual(im.mode, "RGB")
|
||||
self.assertEqual(im.size, (128, 128))
|
||||
self.assertEqual(im.format, "IM")
|
||||
|
||||
@unittest.skipIf(is_pypy(), "Requires CPython")
|
||||
def test_unclosed_file(self):
|
||||
def open():
|
||||
im = Image.open(TEST_IM)
|
||||
im.load()
|
||||
|
||||
self.assert_warning(ResourceWarning, open)
|
||||
|
||||
def test_closed_file(self):
|
||||
def open():
|
||||
im = Image.open(TEST_IM)
|
||||
im.load()
|
||||
im.close()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_context_manager(self):
|
||||
def open():
|
||||
with Image.open(TEST_IM) as im:
|
||||
im.load()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_tell(self):
|
||||
# Arrange
|
||||
im = Image.open(TEST_IM)
|
||||
with Image.open(TEST_IM) as im:
|
||||
|
||||
# Act
|
||||
frame = im.tell()
|
||||
|
@ -32,12 +50,12 @@ class TestFileIm(PillowTestCase):
|
|||
self.assertEqual(frame, 0)
|
||||
|
||||
def test_n_frames(self):
|
||||
im = Image.open(TEST_IM)
|
||||
with Image.open(TEST_IM) as im:
|
||||
self.assertEqual(im.n_frames, 1)
|
||||
self.assertFalse(im.is_animated)
|
||||
|
||||
def test_eoferror(self):
|
||||
im = Image.open(TEST_IM)
|
||||
with Image.open(TEST_IM) as im:
|
||||
n_frames = im.n_frames
|
||||
|
||||
# Test seeking past the last frame
|
||||
|
@ -52,7 +70,7 @@ class TestFileIm(PillowTestCase):
|
|||
out = self.tempfile("temp.im")
|
||||
im = hopper(mode)
|
||||
im.save(out)
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
|
||||
self.assert_image_equal(reread, im)
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ TEST_FILE = "Tests/images/iptc.jpg"
|
|||
class TestFileIptc(PillowTestCase):
|
||||
def test_getiptcinfo_jpg_none(self):
|
||||
# Arrange
|
||||
im = hopper()
|
||||
with hopper() as im:
|
||||
|
||||
# Act
|
||||
iptc = IptcImagePlugin.getiptcinfo(im)
|
||||
|
@ -18,7 +18,7 @@ class TestFileIptc(PillowTestCase):
|
|||
|
||||
def test_getiptcinfo_jpg_found(self):
|
||||
# Arrange
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
# Act
|
||||
iptc = IptcImagePlugin.getiptcinfo(im)
|
||||
|
@ -30,7 +30,7 @@ class TestFileIptc(PillowTestCase):
|
|||
|
||||
def test_getiptcinfo_tiff_none(self):
|
||||
# Arrange
|
||||
im = Image.open("Tests/images/hopper.tif")
|
||||
with Image.open("Tests/images/hopper.tif") as im:
|
||||
|
||||
# Act
|
||||
iptc = IptcImagePlugin.getiptcinfo(im)
|
||||
|
|
|
@ -53,7 +53,7 @@ class TestFileJpeg(PillowTestCase):
|
|||
|
||||
def test_app(self):
|
||||
# Test APP/COM reader (@PIL135)
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
self.assertEqual(
|
||||
im.applist[0], ("APP0", b"JFIF\x00\x01\x01\x01\x00`\x00`\x00\x00")
|
||||
)
|
||||
|
@ -99,13 +99,13 @@ class TestFileJpeg(PillowTestCase):
|
|||
|
||||
def test_icc(self):
|
||||
# Test ICC support
|
||||
im1 = Image.open("Tests/images/rgb.jpg")
|
||||
with Image.open("Tests/images/rgb.jpg") as im1:
|
||||
icc_profile = im1.info["icc_profile"]
|
||||
self.assertEqual(len(icc_profile), 3144)
|
||||
# Roundtrip via physical file.
|
||||
f = self.tempfile("temp.jpg")
|
||||
im1.save(f, icc_profile=icc_profile)
|
||||
im2 = Image.open(f)
|
||||
with Image.open(f) as im2:
|
||||
self.assertEqual(im2.info.get("icc_profile"), icc_profile)
|
||||
# Roundtrip via memory buffer.
|
||||
im1 = self.roundtrip(hopper())
|
||||
|
@ -205,13 +205,13 @@ class TestFileJpeg(PillowTestCase):
|
|||
im.save(f, "JPEG", quality=90, exif=b"1" * 65532)
|
||||
|
||||
def test_exif_typeerror(self):
|
||||
im = Image.open("Tests/images/exif_typeerror.jpg")
|
||||
with Image.open("Tests/images/exif_typeerror.jpg") as im:
|
||||
# Should not raise a TypeError
|
||||
im._getexif()
|
||||
|
||||
def test_exif_gps(self):
|
||||
# Arrange
|
||||
im = Image.open("Tests/images/exif_gps.jpg")
|
||||
with Image.open("Tests/images/exif_gps.jpg") as im:
|
||||
gps_index = 34853
|
||||
expected_exif_gps = {
|
||||
0: b"\x00\x00\x00\x01",
|
||||
|
@ -256,14 +256,14 @@ class TestFileJpeg(PillowTestCase):
|
|||
33434: (4294967295, 1),
|
||||
}
|
||||
|
||||
im = Image.open("Tests/images/exif_gps.jpg")
|
||||
with Image.open("Tests/images/exif_gps.jpg") as im:
|
||||
exif = im._getexif()
|
||||
|
||||
for tag, value in expected_exif.items():
|
||||
self.assertEqual(value, exif[tag])
|
||||
|
||||
def test_exif_gps_typeerror(self):
|
||||
im = Image.open("Tests/images/exif_gps_typeerror.jpg")
|
||||
with Image.open("Tests/images/exif_gps_typeerror.jpg") as im:
|
||||
|
||||
# Should not raise a TypeError
|
||||
im._getexif()
|
||||
|
@ -329,12 +329,12 @@ class TestFileJpeg(PillowTestCase):
|
|||
self.assertRaises(TypeError, self.roundtrip, hopper(), subsampling="1:1:1")
|
||||
|
||||
def test_exif(self):
|
||||
im = Image.open("Tests/images/pil_sample_rgb.jpg")
|
||||
with Image.open("Tests/images/pil_sample_rgb.jpg") as im:
|
||||
info = im._getexif()
|
||||
self.assertEqual(info[305], "Adobe Photoshop CS Macintosh")
|
||||
|
||||
def test_mp(self):
|
||||
im = Image.open("Tests/images/pil_sample_rgb.jpg")
|
||||
with Image.open("Tests/images/pil_sample_rgb.jpg") as im:
|
||||
self.assertIsNone(im._getmp())
|
||||
|
||||
def test_quality_keep(self):
|
||||
|
@ -354,11 +354,13 @@ class TestFileJpeg(PillowTestCase):
|
|||
def test_junk_jpeg_header(self):
|
||||
# https://github.com/python-pillow/Pillow/issues/630
|
||||
filename = "Tests/images/junk_jpeg_header.jpg"
|
||||
Image.open(filename)
|
||||
with Image.open(filename):
|
||||
pass
|
||||
|
||||
def test_ff00_jpeg_header(self):
|
||||
filename = "Tests/images/jpeg_ff00_header.jpg"
|
||||
Image.open(filename)
|
||||
with Image.open(filename):
|
||||
pass
|
||||
|
||||
def test_truncated_jpeg_should_read_all_the_data(self):
|
||||
filename = "Tests/images/truncated_jpeg.jpg"
|
||||
|
@ -370,8 +372,7 @@ class TestFileJpeg(PillowTestCase):
|
|||
|
||||
def test_truncated_jpeg_throws_IOError(self):
|
||||
filename = "Tests/images/truncated_jpeg.jpg"
|
||||
im = Image.open(filename)
|
||||
|
||||
with Image.open(filename) as im:
|
||||
with self.assertRaises(IOError):
|
||||
im.load()
|
||||
|
||||
|
@ -483,7 +484,7 @@ class TestFileJpeg(PillowTestCase):
|
|||
|
||||
@unittest.skipUnless(djpeg_available(), "djpeg not available")
|
||||
def test_load_djpeg(self):
|
||||
img = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as img:
|
||||
img.load_djpeg()
|
||||
self.assert_image_similar(img, Image.open(TEST_FILE), 0)
|
||||
|
||||
|
@ -525,7 +526,7 @@ class TestFileJpeg(PillowTestCase):
|
|||
# Act
|
||||
# Shouldn't raise error
|
||||
fn = "Tests/images/sugarshack_bad_mpo_header.jpg"
|
||||
im = self.assert_warning(UserWarning, Image.open, fn)
|
||||
with self.assert_warning(UserWarning, Image.open, fn) as im:
|
||||
|
||||
# Assert
|
||||
self.assertEqual(im.format, "JPEG")
|
||||
|
@ -558,11 +559,11 @@ class TestFileJpeg(PillowTestCase):
|
|||
|
||||
def test_load_dpi_rounding(self):
|
||||
# Round up
|
||||
im = Image.open("Tests/images/iptc_roundUp.jpg")
|
||||
with Image.open("Tests/images/iptc_roundUp.jpg") as im:
|
||||
self.assertEqual(im.info["dpi"], (44, 44))
|
||||
|
||||
# Round down
|
||||
im = Image.open("Tests/images/iptc_roundDown.jpg")
|
||||
with Image.open("Tests/images/iptc_roundDown.jpg") as im:
|
||||
self.assertEqual(im.info["dpi"], (2, 2))
|
||||
|
||||
def test_save_dpi_rounding(self):
|
||||
|
@ -570,18 +571,18 @@ class TestFileJpeg(PillowTestCase):
|
|||
im = Image.open("Tests/images/hopper.jpg")
|
||||
|
||||
im.save(outfile, dpi=(72.2, 72.2))
|
||||
reloaded = Image.open(outfile)
|
||||
with Image.open(outfile) as reloaded:
|
||||
self.assertEqual(reloaded.info["dpi"], (72, 72))
|
||||
|
||||
im.save(outfile, dpi=(72.8, 72.8))
|
||||
reloaded = Image.open(outfile)
|
||||
with Image.open(outfile) as reloaded:
|
||||
self.assertEqual(reloaded.info["dpi"], (73, 73))
|
||||
|
||||
def test_dpi_tuple_from_exif(self):
|
||||
# Arrange
|
||||
# This Photoshop CC 2017 image has DPI in EXIF not metadata
|
||||
# EXIF XResolution is (2000000, 10000)
|
||||
im = Image.open("Tests/images/photoshop-200dpi.jpg")
|
||||
with Image.open("Tests/images/photoshop-200dpi.jpg") as im:
|
||||
|
||||
# Act / Assert
|
||||
self.assertEqual(im.info.get("dpi"), (200, 200))
|
||||
|
@ -590,7 +591,7 @@ class TestFileJpeg(PillowTestCase):
|
|||
# Arrange
|
||||
# This image has DPI in EXIF not metadata
|
||||
# EXIF XResolution is 72
|
||||
im = Image.open("Tests/images/exif-72dpi-int.jpg")
|
||||
with Image.open("Tests/images/exif-72dpi-int.jpg") as im:
|
||||
|
||||
# Act / Assert
|
||||
self.assertEqual(im.info.get("dpi"), (72, 72))
|
||||
|
@ -599,7 +600,7 @@ class TestFileJpeg(PillowTestCase):
|
|||
# Arrange
|
||||
# This is photoshop-200dpi.jpg with EXIF resolution unit set to cm:
|
||||
# exiftool -exif:ResolutionUnit=cm photoshop-200dpi.jpg
|
||||
im = Image.open("Tests/images/exif-200dpcm.jpg")
|
||||
with Image.open("Tests/images/exif-200dpcm.jpg") as im:
|
||||
|
||||
# Act / Assert
|
||||
self.assertEqual(im.info.get("dpi"), (508, 508))
|
||||
|
@ -608,7 +609,7 @@ class TestFileJpeg(PillowTestCase):
|
|||
# Arrange
|
||||
# This is photoshop-200dpi.jpg with EXIF resolution set to 0/0:
|
||||
# exiftool -XResolution=0/0 -YResolution=0/0 photoshop-200dpi.jpg
|
||||
im = Image.open("Tests/images/exif-dpi-zerodivision.jpg")
|
||||
with Image.open("Tests/images/exif-dpi-zerodivision.jpg") as im:
|
||||
|
||||
# Act / Assert
|
||||
# This should return the default, and not raise a ZeroDivisionError
|
||||
|
@ -618,7 +619,7 @@ class TestFileJpeg(PillowTestCase):
|
|||
# Arrange
|
||||
# This is photoshop-200dpi.jpg with resolution removed from EXIF:
|
||||
# exiftool "-*resolution*"= photoshop-200dpi.jpg
|
||||
im = Image.open("Tests/images/no-dpi-in-exif.jpg")
|
||||
with Image.open("Tests/images/no-dpi-in-exif.jpg") as im:
|
||||
|
||||
# Act / Assert
|
||||
# "When the image resolution is unknown, 72 [dpi] is designated."
|
||||
|
@ -628,7 +629,7 @@ class TestFileJpeg(PillowTestCase):
|
|||
def test_invalid_exif(self):
|
||||
# This is no-dpi-in-exif with the tiff header of the exif block
|
||||
# hexedited from MM * to FF FF FF FF
|
||||
im = Image.open("Tests/images/invalid-exif.jpg")
|
||||
with Image.open("Tests/images/invalid-exif.jpg") as im:
|
||||
|
||||
# This should return the default, and not a SyntaxError or
|
||||
# OSError for unidentified image.
|
||||
|
@ -638,13 +639,13 @@ class TestFileJpeg(PillowTestCase):
|
|||
# Arrange
|
||||
# This image has been manually hexedited to have an IFD offset of 10,
|
||||
# in contrast to normal 8
|
||||
im = Image.open("Tests/images/exif-ifd-offset.jpg")
|
||||
with Image.open("Tests/images/exif-ifd-offset.jpg") as im:
|
||||
|
||||
# Act / Assert
|
||||
self.assertEqual(im._getexif()[306], "2017:03:13 23:03:09")
|
||||
|
||||
def test_photoshop(self):
|
||||
im = Image.open("Tests/images/photoshop-200dpi.jpg")
|
||||
with Image.open("Tests/images/photoshop-200dpi.jpg") as im:
|
||||
self.assertEqual(
|
||||
im.info["photoshop"][0x03ED],
|
||||
{
|
||||
|
@ -656,7 +657,7 @@ class TestFileJpeg(PillowTestCase):
|
|||
)
|
||||
|
||||
# This image does not contain a Photoshop header string
|
||||
im = Image.open("Tests/images/app13.jpg")
|
||||
with Image.open("Tests/images/app13.jpg") as im:
|
||||
self.assertNotIn("photoshop", im.info)
|
||||
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@ class TestFileJpeg2k(PillowTestCase):
|
|||
self.assertEqual(im.get_format_mimetype(), "image/jp2")
|
||||
|
||||
def test_jpf(self):
|
||||
im = Image.open("Tests/images/balloon.jpf")
|
||||
with Image.open("Tests/images/balloon.jpf") as im:
|
||||
self.assertEqual(im.format, "JPEG2000")
|
||||
self.assertEqual(im.get_format_mimetype(), "image/jpx")
|
||||
|
||||
|
|
|
@ -144,9 +144,8 @@ class TestFileLibTiff(LibTiffTestCase):
|
|||
def test_write_metadata(self):
|
||||
""" Test metadata writing through libtiff """
|
||||
for legacy_api in [False, True]:
|
||||
img = Image.open("Tests/images/hopper_g4.tif")
|
||||
f = self.tempfile("temp.tiff")
|
||||
|
||||
with Image.open("Tests/images/hopper_g4.tif") as img:
|
||||
img.save(f, tiffinfo=img.tag)
|
||||
|
||||
if legacy_api:
|
||||
|
@ -163,7 +162,7 @@ class TestFileLibTiff(LibTiffTestCase):
|
|||
"PhotometricInterpretation",
|
||||
]
|
||||
|
||||
loaded = Image.open(f)
|
||||
with Image.open(f) as loaded:
|
||||
if legacy_api:
|
||||
reloaded = loaded.tag.named()
|
||||
else:
|
||||
|
@ -302,7 +301,7 @@ class TestFileLibTiff(LibTiffTestCase):
|
|||
out = self.tempfile("temp.tif")
|
||||
im.save(out, tiffinfo=tiffinfo)
|
||||
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
for tag, value in tiffinfo.items():
|
||||
reloaded_value = reloaded.tag_v2[tag]
|
||||
if (
|
||||
|
@ -343,7 +342,7 @@ class TestFileLibTiff(LibTiffTestCase):
|
|||
TiffImagePlugin.WRITE_LIBTIFF = True
|
||||
im.save(out, dpi=(72, 72))
|
||||
TiffImagePlugin.WRITE_LIBTIFF = False
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
self.assertEqual(reloaded.info["dpi"], (72.0, 72.0))
|
||||
|
||||
def test_g3_compression(self):
|
||||
|
@ -412,7 +411,7 @@ class TestFileLibTiff(LibTiffTestCase):
|
|||
orig.tag[269] = "temp.tif"
|
||||
orig.save(out)
|
||||
|
||||
reread = Image.open(out)
|
||||
with Image.open(out) as reread:
|
||||
self.assertEqual("temp.tif", reread.tag_v2[269])
|
||||
self.assertEqual("temp.tif", reread.tag[269][0])
|
||||
|
||||
|
@ -521,7 +520,7 @@ class TestFileLibTiff(LibTiffTestCase):
|
|||
def test_multipage(self):
|
||||
# issue #862
|
||||
TiffImagePlugin.READ_LIBTIFF = True
|
||||
im = Image.open("Tests/images/multipage.tiff")
|
||||
with Image.open("Tests/images/multipage.tiff") as im:
|
||||
# file is a multipage tiff, 10x10 green, 10x10 red, 20x20 blue
|
||||
|
||||
im.seek(0)
|
||||
|
@ -544,7 +543,7 @@ class TestFileLibTiff(LibTiffTestCase):
|
|||
def test_multipage_nframes(self):
|
||||
# issue #862
|
||||
TiffImagePlugin.READ_LIBTIFF = True
|
||||
im = Image.open("Tests/images/multipage.tiff")
|
||||
with Image.open("Tests/images/multipage.tiff") as im:
|
||||
frames = im.n_frames
|
||||
self.assertEqual(frames, 3)
|
||||
for _ in range(frames):
|
||||
|
@ -656,7 +655,7 @@ class TestFileLibTiff(LibTiffTestCase):
|
|||
# /usr/bin/gs -q -sDEVICE=tiffg3 -sOutputFile=total-pages-zero.tif
|
||||
# -dNOPAUSE /tmp/test.pdf -c quit
|
||||
infile = "Tests/images/total-pages-zero.tif"
|
||||
im = Image.open(infile)
|
||||
with Image.open(infile) as im:
|
||||
# Should not divide by zero
|
||||
im.save(outfile)
|
||||
|
||||
|
@ -686,7 +685,7 @@ class TestFileLibTiff(LibTiffTestCase):
|
|||
self.assertEqual(icc, icc_libtiff)
|
||||
|
||||
def test_multipage_compression(self):
|
||||
im = Image.open("Tests/images/compression.tif")
|
||||
with Image.open("Tests/images/compression.tif") as im:
|
||||
|
||||
im.seek(0)
|
||||
self.assertEqual(im._compression, "tiff_ccitt")
|
||||
|
@ -836,7 +835,7 @@ class TestFileLibTiff(LibTiffTestCase):
|
|||
def test_no_rows_per_strip(self):
|
||||
# This image does not have a RowsPerStrip TIFF tag
|
||||
infile = "Tests/images/no_rows_per_strip.tif"
|
||||
im = Image.open(infile)
|
||||
with Image.open(infile) as im:
|
||||
im.load()
|
||||
self.assertEqual(im.size, (950, 975))
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ TEST_FILE = "Tests/images/hopper.mic"
|
|||
@unittest.skipUnless(features.check("libtiff"), "libtiff not installed")
|
||||
class TestFileMic(PillowTestCase):
|
||||
def test_sanity(self):
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
im.load()
|
||||
self.assertEqual(im.mode, "RGBA")
|
||||
self.assertEqual(im.size, (128, 128))
|
||||
|
@ -30,22 +30,22 @@ class TestFileMic(PillowTestCase):
|
|||
self.assert_image_similar(im, im2, 10)
|
||||
|
||||
def test_n_frames(self):
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
self.assertEqual(im.n_frames, 1)
|
||||
|
||||
def test_is_animated(self):
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
self.assertFalse(im.is_animated)
|
||||
|
||||
def test_tell(self):
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
self.assertEqual(im.tell(), 0)
|
||||
|
||||
def test_seek(self):
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
im.seek(0)
|
||||
self.assertEqual(im.tell(), 0)
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
import unittest
|
||||
from io import BytesIO
|
||||
|
||||
from PIL import Image
|
||||
|
||||
from .helper import PillowTestCase
|
||||
from .helper import PillowTestCase, is_pypy
|
||||
|
||||
test_files = ["Tests/images/sugarshack.mpo", "Tests/images/frozenpond.mpo"]
|
||||
|
||||
|
@ -25,33 +26,50 @@ class TestFileMpo(PillowTestCase):
|
|||
|
||||
def test_sanity(self):
|
||||
for test_file in test_files:
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
im.load()
|
||||
self.assertEqual(im.mode, "RGB")
|
||||
self.assertEqual(im.size, (640, 480))
|
||||
self.assertEqual(im.format, "MPO")
|
||||
|
||||
@unittest.skipIf(is_pypy(), "Requires CPython")
|
||||
def test_unclosed_file(self):
|
||||
def open():
|
||||
im = Image.open(test_files[0])
|
||||
im.load()
|
||||
|
||||
self.assert_warning(ResourceWarning, open)
|
||||
|
||||
def test_closed_file(self):
|
||||
def open():
|
||||
im = Image.open(test_files[0])
|
||||
im.load()
|
||||
im.close()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_context_manager(self):
|
||||
def open():
|
||||
with Image.open(test_files[0]) as im:
|
||||
im.load()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_app(self):
|
||||
for test_file in test_files:
|
||||
# Test APP/COM reader (@PIL135)
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
self.assertEqual(im.applist[0][0], "APP1")
|
||||
self.assertEqual(im.applist[1][0], "APP2")
|
||||
self.assertEqual(
|
||||
im.applist[1][1][:16], b"MPF\x00MM\x00*\x00\x00\x00\x08\x00\x03\xb0\x00"
|
||||
im.applist[1][1][:16],
|
||||
b"MPF\x00MM\x00*\x00\x00\x00\x08\x00\x03\xb0\x00",
|
||||
)
|
||||
self.assertEqual(len(im.applist), 2)
|
||||
|
||||
def test_exif(self):
|
||||
for test_file in test_files:
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
info = im._getexif()
|
||||
self.assertEqual(info[272], "Nintendo 3DS")
|
||||
self.assertEqual(info[296], 2)
|
||||
|
@ -60,7 +78,7 @@ class TestFileMpo(PillowTestCase):
|
|||
def test_frame_size(self):
|
||||
# This image has been hexedited to contain a different size
|
||||
# in the EXIF data of the second frame
|
||||
im = Image.open("Tests/images/sugarshack_frame_size.mpo")
|
||||
with Image.open("Tests/images/sugarshack_frame_size.mpo") as im:
|
||||
self.assertEqual(im.size, (640, 480))
|
||||
|
||||
im.seek(1)
|
||||
|
@ -68,19 +86,21 @@ class TestFileMpo(PillowTestCase):
|
|||
|
||||
def test_parallax(self):
|
||||
# Nintendo
|
||||
im = Image.open("Tests/images/sugarshack.mpo")
|
||||
with Image.open("Tests/images/sugarshack.mpo") as im:
|
||||
exif = im.getexif()
|
||||
self.assertEqual(exif.get_ifd(0x927C)[0x1101]["Parallax"], -44.798187255859375)
|
||||
self.assertEqual(
|
||||
exif.get_ifd(0x927C)[0x1101]["Parallax"], -44.798187255859375
|
||||
)
|
||||
|
||||
# Fujifilm
|
||||
im = Image.open("Tests/images/fujifilm.mpo")
|
||||
with Image.open("Tests/images/fujifilm.mpo") as im:
|
||||
im.seek(1)
|
||||
exif = im.getexif()
|
||||
self.assertEqual(exif.get_ifd(0x927C)[0xB211], -3.125)
|
||||
|
||||
def test_mp(self):
|
||||
for test_file in test_files:
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
mpinfo = im._getmp()
|
||||
self.assertEqual(mpinfo[45056], b"0100")
|
||||
self.assertEqual(mpinfo[45057], 2)
|
||||
|
@ -88,14 +108,14 @@ class TestFileMpo(PillowTestCase):
|
|||
def test_mp_offset(self):
|
||||
# This image has been manually hexedited to have an IFD offset of 10
|
||||
# in APP2 data, in contrast to normal 8
|
||||
im = Image.open("Tests/images/sugarshack_ifd_offset.mpo")
|
||||
with Image.open("Tests/images/sugarshack_ifd_offset.mpo") as im:
|
||||
mpinfo = im._getmp()
|
||||
self.assertEqual(mpinfo[45056], b"0100")
|
||||
self.assertEqual(mpinfo[45057], 2)
|
||||
|
||||
def test_mp_attribute(self):
|
||||
for test_file in test_files:
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
mpinfo = im._getmp()
|
||||
frameNumber = 0
|
||||
for mpentry in mpinfo[45058]:
|
||||
|
@ -113,7 +133,7 @@ class TestFileMpo(PillowTestCase):
|
|||
|
||||
def test_seek(self):
|
||||
for test_file in test_files:
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
self.assertEqual(im.tell(), 0)
|
||||
# prior to first image raises an error, both blatant and borderline
|
||||
self.assertRaises(EOFError, im.seek, -1)
|
||||
|
@ -132,12 +152,12 @@ class TestFileMpo(PillowTestCase):
|
|||
self.assertEqual(im.tell(), 0)
|
||||
|
||||
def test_n_frames(self):
|
||||
im = Image.open("Tests/images/sugarshack.mpo")
|
||||
with Image.open("Tests/images/sugarshack.mpo") as im:
|
||||
self.assertEqual(im.n_frames, 2)
|
||||
self.assertTrue(im.is_animated)
|
||||
|
||||
def test_eoferror(self):
|
||||
im = Image.open("Tests/images/sugarshack.mpo")
|
||||
with Image.open("Tests/images/sugarshack.mpo") as im:
|
||||
n_frames = im.n_frames
|
||||
|
||||
# Test seeking past the last frame
|
||||
|
@ -149,7 +169,7 @@ class TestFileMpo(PillowTestCase):
|
|||
|
||||
def test_image_grab(self):
|
||||
for test_file in test_files:
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
self.assertEqual(im.tell(), 0)
|
||||
im0 = im.tobytes()
|
||||
im.seek(1)
|
||||
|
@ -164,7 +184,7 @@ class TestFileMpo(PillowTestCase):
|
|||
def test_save(self):
|
||||
# Note that only individual frames can be saved at present
|
||||
for test_file in test_files:
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
self.assertEqual(im.tell(), 0)
|
||||
jpg0 = self.frame_roundtrip(im)
|
||||
self.assert_image_similar(im, jpg0, 30)
|
||||
|
|
|
@ -82,7 +82,7 @@ class TestFilePdf(PillowTestCase):
|
|||
self.helper_save_as_pdf("RGB", save_all=True)
|
||||
|
||||
# Multiframe image
|
||||
im = Image.open("Tests/images/dispose_bgnd.gif")
|
||||
with Image.open("Tests/images/dispose_bgnd.gif") as im:
|
||||
|
||||
outfile = self.tempfile("temp.pdf")
|
||||
im.save(outfile, save_all=True)
|
||||
|
@ -116,7 +116,7 @@ class TestFilePdf(PillowTestCase):
|
|||
|
||||
def test_multiframe_normal_save(self):
|
||||
# Test saving a multiframe image without save_all
|
||||
im = Image.open("Tests/images/dispose_bgnd.gif")
|
||||
with Image.open("Tests/images/dispose_bgnd.gif") as im:
|
||||
|
||||
outfile = self.tempfile("temp.pdf")
|
||||
im.save(outfile)
|
||||
|
|
|
@ -81,7 +81,7 @@ class TestFilePng(PillowTestCase):
|
|||
|
||||
hopper("RGB").save(test_file)
|
||||
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
im.load()
|
||||
self.assertEqual(im.mode, "RGB")
|
||||
self.assertEqual(im.size, (128, 128))
|
||||
|
@ -393,11 +393,11 @@ class TestFilePng(PillowTestCase):
|
|||
|
||||
def test_load_dpi_rounding(self):
|
||||
# Round up
|
||||
im = Image.open(TEST_PNG_FILE)
|
||||
with Image.open(TEST_PNG_FILE) as im:
|
||||
self.assertEqual(im.info["dpi"], (96, 96))
|
||||
|
||||
# Round down
|
||||
im = Image.open("Tests/images/icc_profile_none.png")
|
||||
with Image.open("Tests/images/icc_profile_none.png") as im:
|
||||
self.assertEqual(im.info["dpi"], (72, 72))
|
||||
|
||||
def test_save_dpi_rounding(self):
|
||||
|
@ -462,8 +462,13 @@ class TestFilePng(PillowTestCase):
|
|||
if py3:
|
||||
rt_text(" Aa" + chr(0xA0) + chr(0xC4) + chr(0xFF)) # Latin1
|
||||
rt_text(chr(0x400) + chr(0x472) + chr(0x4FF)) # Cyrillic
|
||||
# CJK:
|
||||
rt_text(chr(0x4E00) + chr(0x66F0) + chr(0x9FBA) + chr(0x3042) + chr(0xAC00))
|
||||
rt_text(
|
||||
chr(0x4E00)
|
||||
+ chr(0x66F0)
|
||||
+ chr(0x9FBA) # CJK
|
||||
+ chr(0x3042)
|
||||
+ chr(0xAC00)
|
||||
)
|
||||
rt_text("A" + chr(0xC4) + chr(0x472) + chr(0x3042)) # Combined
|
||||
|
||||
def test_scary(self):
|
||||
|
@ -509,15 +514,15 @@ class TestFilePng(PillowTestCase):
|
|||
def test_trns_null(self):
|
||||
# Check reading images with null tRNS value, issue #1239
|
||||
test_file = "Tests/images/tRNS_null_1x1.png"
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
|
||||
self.assertEqual(im.info["transparency"], 0)
|
||||
|
||||
def test_save_icc_profile(self):
|
||||
im = Image.open("Tests/images/icc_profile_none.png")
|
||||
with Image.open("Tests/images/icc_profile_none.png") as im:
|
||||
self.assertIsNone(im.info["icc_profile"])
|
||||
|
||||
with_icc = Image.open("Tests/images/icc_profile.png")
|
||||
with Image.open("Tests/images/icc_profile.png") as with_icc:
|
||||
expected_icc = with_icc.info["icc_profile"]
|
||||
|
||||
im = roundtrip(im, icc_profile=expected_icc)
|
||||
|
@ -614,7 +619,7 @@ class TestFilePng(PillowTestCase):
|
|||
test_file = self.tempfile("temp.png")
|
||||
im.save(test_file)
|
||||
|
||||
reloaded = Image.open(test_file)
|
||||
with Image.open(test_file) as reloaded:
|
||||
exif = reloaded._getexif()
|
||||
self.assertEqual(exif[274], 1)
|
||||
|
||||
|
@ -624,7 +629,7 @@ class TestFilePng(PillowTestCase):
|
|||
test_file = self.tempfile("temp.png")
|
||||
im.save(test_file)
|
||||
|
||||
reloaded = Image.open(test_file)
|
||||
with Image.open(test_file) as reloaded:
|
||||
exif = reloaded._getexif()
|
||||
self.assertEqual(exif[305], "Adobe Photoshop CS Macintosh")
|
||||
|
||||
|
@ -634,7 +639,7 @@ class TestFilePng(PillowTestCase):
|
|||
test_file = self.tempfile("temp.png")
|
||||
im.save(test_file, exif=b"exifstring")
|
||||
|
||||
reloaded = Image.open(test_file)
|
||||
with Image.open(test_file) as reloaded:
|
||||
self.assertEqual(reloaded.info["exif"], b"Exif\x00\x00exifstring")
|
||||
|
||||
@unittest.skipUnless(
|
||||
|
|
|
@ -66,10 +66,10 @@ class TestFilePpm(PillowTestCase):
|
|||
|
||||
with open(path, "w") as f:
|
||||
f.write("P4\n128 128\n255")
|
||||
im = Image.open(path)
|
||||
with Image.open(path) as im:
|
||||
self.assertEqual(im.get_format_mimetype(), "image/x-portable-bitmap")
|
||||
|
||||
with open(path, "w") as f:
|
||||
f.write("PyCMYK\n128 128\n255")
|
||||
im = Image.open(path)
|
||||
with Image.open(path) as im:
|
||||
self.assertEqual(im.get_format_mimetype(), "image/x-portable-anymap")
|
||||
|
|
|
@ -1,13 +1,15 @@
|
|||
import unittest
|
||||
|
||||
from PIL import Image, PsdImagePlugin
|
||||
|
||||
from .helper import PillowTestCase, hopper
|
||||
from .helper import PillowTestCase, hopper, is_pypy
|
||||
|
||||
test_file = "Tests/images/hopper.psd"
|
||||
|
||||
|
||||
class TestImagePsd(PillowTestCase):
|
||||
def test_sanity(self):
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
im.load()
|
||||
self.assertEqual(im.mode, "RGB")
|
||||
self.assertEqual(im.size, (128, 128))
|
||||
|
@ -16,11 +18,28 @@ class TestImagePsd(PillowTestCase):
|
|||
im2 = hopper()
|
||||
self.assert_image_similar(im, im2, 4.8)
|
||||
|
||||
@unittest.skipIf(is_pypy(), "Requires CPython")
|
||||
def test_unclosed_file(self):
|
||||
def open():
|
||||
im = Image.open(test_file)
|
||||
im.load()
|
||||
|
||||
self.assert_warning(ResourceWarning, open)
|
||||
|
||||
def test_closed_file(self):
|
||||
def open():
|
||||
im = Image.open(test_file)
|
||||
im.load()
|
||||
im.close()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_context_manager(self):
|
||||
def open():
|
||||
im = Image.open(test_file)
|
||||
im.load()
|
||||
im.close()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_invalid_file(self):
|
||||
|
@ -29,16 +48,16 @@ class TestImagePsd(PillowTestCase):
|
|||
self.assertRaises(SyntaxError, PsdImagePlugin.PsdImageFile, invalid_file)
|
||||
|
||||
def test_n_frames(self):
|
||||
im = Image.open("Tests/images/hopper_merged.psd")
|
||||
with Image.open("Tests/images/hopper_merged.psd") as im:
|
||||
self.assertEqual(im.n_frames, 1)
|
||||
self.assertFalse(im.is_animated)
|
||||
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
self.assertEqual(im.n_frames, 2)
|
||||
self.assertTrue(im.is_animated)
|
||||
|
||||
def test_eoferror(self):
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
# PSD seek index starts at 1 rather than 0
|
||||
n_frames = im.n_frames + 1
|
||||
|
||||
|
@ -50,7 +69,7 @@ class TestImagePsd(PillowTestCase):
|
|||
im.seek(n_frames - 1)
|
||||
|
||||
def test_seek_tell(self):
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
|
||||
layer_number = im.tell()
|
||||
self.assertEqual(layer_number, 1)
|
||||
|
@ -66,26 +85,25 @@ class TestImagePsd(PillowTestCase):
|
|||
self.assertEqual(layer_number, 2)
|
||||
|
||||
def test_seek_eoferror(self):
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
|
||||
self.assertRaises(EOFError, im.seek, -1)
|
||||
|
||||
def test_open_after_exclusive_load(self):
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
im.load()
|
||||
im.seek(im.tell() + 1)
|
||||
im.load()
|
||||
|
||||
def test_icc_profile(self):
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
self.assertIn("icc_profile", im.info)
|
||||
|
||||
icc_profile = im.info["icc_profile"]
|
||||
self.assertEqual(len(icc_profile), 3144)
|
||||
|
||||
def test_no_icc_profile(self):
|
||||
im = Image.open("Tests/images/hopper_merged.psd")
|
||||
|
||||
with Image.open("Tests/images/hopper_merged.psd") as im:
|
||||
self.assertNotIn("icc_profile", im.info)
|
||||
|
||||
def test_combined_larger_than_size(self):
|
||||
|
|
|
@ -1,26 +1,43 @@
|
|||
import tempfile
|
||||
import unittest
|
||||
from io import BytesIO
|
||||
|
||||
from PIL import Image, ImageSequence, SpiderImagePlugin
|
||||
|
||||
from .helper import PillowTestCase, hopper
|
||||
from .helper import PillowTestCase, hopper, is_pypy
|
||||
|
||||
TEST_FILE = "Tests/images/hopper.spider"
|
||||
|
||||
|
||||
class TestImageSpider(PillowTestCase):
|
||||
def test_sanity(self):
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
im.load()
|
||||
self.assertEqual(im.mode, "F")
|
||||
self.assertEqual(im.size, (128, 128))
|
||||
self.assertEqual(im.format, "SPIDER")
|
||||
|
||||
@unittest.skipIf(is_pypy(), "Requires CPython")
|
||||
def test_unclosed_file(self):
|
||||
def open():
|
||||
im = Image.open(TEST_FILE)
|
||||
im.load()
|
||||
|
||||
self.assert_warning(ResourceWarning, open)
|
||||
|
||||
def test_closed_file(self):
|
||||
def open():
|
||||
im = Image.open(TEST_FILE)
|
||||
im.load()
|
||||
im.close()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_context_manager(self):
|
||||
def open():
|
||||
with Image.open(TEST_FILE) as im:
|
||||
im.load()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_save(self):
|
||||
|
@ -32,7 +49,7 @@ class TestImageSpider(PillowTestCase):
|
|||
im.save(temp, "SPIDER")
|
||||
|
||||
# Assert
|
||||
im2 = Image.open(temp)
|
||||
with Image.open(temp) as im2:
|
||||
self.assertEqual(im2.mode, "F")
|
||||
self.assertEqual(im2.size, (128, 128))
|
||||
self.assertEqual(im2.format, "SPIDER")
|
||||
|
@ -57,7 +74,7 @@ class TestImageSpider(PillowTestCase):
|
|||
|
||||
def test_tell(self):
|
||||
# Arrange
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
|
||||
# Act
|
||||
index = im.tell()
|
||||
|
@ -66,7 +83,7 @@ class TestImageSpider(PillowTestCase):
|
|||
self.assertEqual(index, 0)
|
||||
|
||||
def test_n_frames(self):
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
self.assertEqual(im.n_frames, 1)
|
||||
self.assertFalse(im.is_animated)
|
||||
|
||||
|
@ -109,12 +126,11 @@ class TestImageSpider(PillowTestCase):
|
|||
self.assertRaises(IOError, Image.open, invalid_file)
|
||||
|
||||
def test_nonstack_file(self):
|
||||
im = Image.open(TEST_FILE)
|
||||
|
||||
with Image.open(TEST_FILE) as im:
|
||||
self.assertRaises(EOFError, im.seek, 0)
|
||||
|
||||
def test_nonstack_dos(self):
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
for i, frame in enumerate(ImageSequence.Iterator(im)):
|
||||
if i > 1:
|
||||
self.fail("Non-stack DOS file test failed")
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
import unittest
|
||||
|
||||
from PIL import Image, TarIO
|
||||
|
||||
from .helper import PillowTestCase
|
||||
from .helper import PillowTestCase, is_pypy
|
||||
|
||||
codecs = dir(Image.core)
|
||||
|
||||
|
@ -19,17 +21,30 @@ class TestFileTar(PillowTestCase):
|
|||
["jpeg_decoder", "hopper.jpg", "JPEG"],
|
||||
]:
|
||||
if codec in codecs:
|
||||
tar = TarIO.TarIO(TEST_TAR_FILE, test_path)
|
||||
with TarIO.TarIO(TEST_TAR_FILE, test_path) as tar:
|
||||
im = Image.open(tar)
|
||||
im.load()
|
||||
self.assertEqual(im.mode, "RGB")
|
||||
self.assertEqual(im.size, (128, 128))
|
||||
self.assertEqual(im.format, format)
|
||||
|
||||
@unittest.skipIf(is_pypy(), "Requires CPython")
|
||||
def test_unclosed_file(self):
|
||||
def open():
|
||||
TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg")
|
||||
|
||||
self.assert_warning(ResourceWarning, open)
|
||||
|
||||
def test_close(self):
|
||||
def open():
|
||||
tar = TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg")
|
||||
tar.close()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_contextmanager(self):
|
||||
def open():
|
||||
with TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg"):
|
||||
pass
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
|
|
@ -76,7 +76,7 @@ class TestFileTga(PillowTestCase):
|
|||
test_file = "Tests/images/tga_id_field.tga"
|
||||
|
||||
# Act
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
|
||||
# Assert
|
||||
self.assertEqual(im.size, (100, 100))
|
||||
|
@ -86,7 +86,7 @@ class TestFileTga(PillowTestCase):
|
|||
test_file = "Tests/images/rgb32rle.tga"
|
||||
|
||||
# Act
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
|
||||
# Assert
|
||||
self.assertEqual(im.size, (199, 199))
|
||||
|
@ -99,13 +99,13 @@ class TestFileTga(PillowTestCase):
|
|||
|
||||
# Save
|
||||
im.save(out)
|
||||
test_im = Image.open(out)
|
||||
with Image.open(out) as test_im:
|
||||
self.assertEqual(test_im.size, (100, 100))
|
||||
self.assertEqual(test_im.info["id_section"], im.info["id_section"])
|
||||
|
||||
# RGBA save
|
||||
im.convert("RGBA").save(out)
|
||||
test_im = Image.open(out)
|
||||
with Image.open(out) as test_im:
|
||||
self.assertEqual(test_im.size, (100, 100))
|
||||
|
||||
def test_save_id_section(self):
|
||||
|
@ -116,26 +116,26 @@ class TestFileTga(PillowTestCase):
|
|||
|
||||
# Check there is no id section
|
||||
im.save(out)
|
||||
test_im = Image.open(out)
|
||||
with Image.open(out) as test_im:
|
||||
self.assertNotIn("id_section", test_im.info)
|
||||
|
||||
# Save with custom id section
|
||||
im.save(out, id_section=b"Test content")
|
||||
test_im = Image.open(out)
|
||||
with Image.open(out) as test_im:
|
||||
self.assertEqual(test_im.info["id_section"], b"Test content")
|
||||
|
||||
# Save with custom id section greater than 255 characters
|
||||
id_section = b"Test content" * 25
|
||||
self.assert_warning(UserWarning, lambda: im.save(out, id_section=id_section))
|
||||
test_im = Image.open(out)
|
||||
with Image.open(out) as test_im:
|
||||
self.assertEqual(test_im.info["id_section"], id_section[:255])
|
||||
|
||||
test_file = "Tests/images/tga_id_field.tga"
|
||||
im = Image.open(test_file)
|
||||
with Image.open(test_file) as im:
|
||||
|
||||
# Save with no id section
|
||||
im.save(out, id_section="")
|
||||
test_im = Image.open(out)
|
||||
with Image.open(out) as test_im:
|
||||
self.assertNotIn("id_section", test_im.info)
|
||||
|
||||
def test_save_orientation(self):
|
||||
|
@ -146,7 +146,7 @@ class TestFileTga(PillowTestCase):
|
|||
out = self.tempfile("temp.tga")
|
||||
|
||||
im.save(out, orientation=1)
|
||||
test_im = Image.open(out)
|
||||
with Image.open(out) as test_im:
|
||||
self.assertEqual(test_im.info["orientation"], 1)
|
||||
|
||||
def test_save_rle(self):
|
||||
|
@ -158,18 +158,18 @@ class TestFileTga(PillowTestCase):
|
|||
|
||||
# Save
|
||||
im.save(out)
|
||||
test_im = Image.open(out)
|
||||
with Image.open(out) as test_im:
|
||||
self.assertEqual(test_im.size, (199, 199))
|
||||
self.assertEqual(test_im.info["compression"], "tga_rle")
|
||||
|
||||
# Save without compression
|
||||
im.save(out, compression=None)
|
||||
test_im = Image.open(out)
|
||||
with Image.open(out) as test_im:
|
||||
self.assertNotIn("compression", test_im.info)
|
||||
|
||||
# RGBA save
|
||||
im.convert("RGBA").save(out)
|
||||
test_im = Image.open(out)
|
||||
with Image.open(out) as test_im:
|
||||
self.assertEqual(test_im.size, (199, 199))
|
||||
|
||||
test_file = "Tests/images/tga_id_field.tga"
|
||||
|
@ -178,7 +178,7 @@ class TestFileTga(PillowTestCase):
|
|||
|
||||
# Save with compression
|
||||
im.save(out, compression="tga_rle")
|
||||
test_im = Image.open(out)
|
||||
with Image.open(out) as test_im:
|
||||
self.assertEqual(test_im.info["compression"], "tga_rle")
|
||||
|
||||
def test_save_l_transparency(self):
|
||||
|
|
|
@ -6,7 +6,7 @@ from PIL import Image, TiffImagePlugin
|
|||
from PIL._util import py3
|
||||
from PIL.TiffImagePlugin import RESOLUTION_UNIT, X_RESOLUTION, Y_RESOLUTION
|
||||
|
||||
from .helper import PillowTestCase, hopper, is_win32, unittest
|
||||
from .helper import PillowTestCase, hopper, is_pypy, is_win32, unittest
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
@ -18,32 +18,53 @@ class TestFileTiff(PillowTestCase):
|
|||
|
||||
hopper("RGB").save(filename)
|
||||
|
||||
im = Image.open(filename)
|
||||
with Image.open(filename) as im:
|
||||
im.load()
|
||||
self.assertEqual(im.mode, "RGB")
|
||||
self.assertEqual(im.size, (128, 128))
|
||||
self.assertEqual(im.format, "TIFF")
|
||||
|
||||
hopper("1").save(filename)
|
||||
Image.open(filename)
|
||||
with Image.open(filename):
|
||||
pass
|
||||
|
||||
hopper("L").save(filename)
|
||||
Image.open(filename)
|
||||
with Image.open(filename):
|
||||
pass
|
||||
|
||||
hopper("P").save(filename)
|
||||
Image.open(filename)
|
||||
with Image.open(filename):
|
||||
pass
|
||||
|
||||
hopper("RGB").save(filename)
|
||||
Image.open(filename)
|
||||
with Image.open(filename):
|
||||
pass
|
||||
|
||||
hopper("I").save(filename)
|
||||
Image.open(filename)
|
||||
with Image.open(filename):
|
||||
pass
|
||||
|
||||
@unittest.skipIf(is_pypy(), "Requires CPython")
|
||||
def test_unclosed_file(self):
|
||||
def open():
|
||||
im = Image.open("Tests/images/multipage.tiff")
|
||||
im.load()
|
||||
|
||||
self.assert_warning(ResourceWarning, open)
|
||||
|
||||
def test_closed_file(self):
|
||||
def open():
|
||||
im = Image.open("Tests/images/multipage.tiff")
|
||||
im.load()
|
||||
im.close()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_context_manager(self):
|
||||
def open():
|
||||
with Image.open("Tests/images/multipage.tiff") as im:
|
||||
im.load()
|
||||
|
||||
self.assert_warning(None, open)
|
||||
|
||||
def test_mac_tiff(self):
|
||||
|
@ -75,7 +96,7 @@ class TestFileTiff(PillowTestCase):
|
|||
|
||||
def test_xyres_tiff(self):
|
||||
filename = "Tests/images/pil168.tif"
|
||||
im = Image.open(filename)
|
||||
with Image.open(filename) as im:
|
||||
|
||||
# legacy api
|
||||
self.assertIsInstance(im.tag[X_RESOLUTION][0], tuple)
|
||||
|
@ -89,7 +110,7 @@ class TestFileTiff(PillowTestCase):
|
|||
|
||||
def test_xyres_fallback_tiff(self):
|
||||
filename = "Tests/images/compression.tif"
|
||||
im = Image.open(filename)
|
||||
with Image.open(filename) as im:
|
||||
|
||||
# v2 api
|
||||
self.assertIsInstance(im.tag_v2[X_RESOLUTION], TiffImagePlugin.IFDRational)
|
||||
|
@ -103,7 +124,7 @@ class TestFileTiff(PillowTestCase):
|
|||
|
||||
def test_int_resolution(self):
|
||||
filename = "Tests/images/pil168.tif"
|
||||
im = Image.open(filename)
|
||||
with Image.open(filename) as im:
|
||||
|
||||
# Try to read a file where X,Y_RESOLUTION are ints
|
||||
im.tag_v2[X_RESOLUTION] = 71
|
||||
|
@ -113,15 +134,15 @@ class TestFileTiff(PillowTestCase):
|
|||
|
||||
def test_load_dpi_rounding(self):
|
||||
for resolutionUnit, dpi in ((None, (72, 73)), (2, (72, 73)), (3, (183, 185))):
|
||||
im = Image.open(
|
||||
with Image.open(
|
||||
"Tests/images/hopper_roundDown_" + str(resolutionUnit) + ".tif"
|
||||
)
|
||||
) as im:
|
||||
self.assertEqual(im.tag_v2.get(RESOLUTION_UNIT), resolutionUnit)
|
||||
self.assertEqual(im.info["dpi"], (dpi[0], dpi[0]))
|
||||
|
||||
im = Image.open(
|
||||
with Image.open(
|
||||
"Tests/images/hopper_roundUp_" + str(resolutionUnit) + ".tif"
|
||||
)
|
||||
) as im:
|
||||
self.assertEqual(im.tag_v2.get(RESOLUTION_UNIT), resolutionUnit)
|
||||
self.assertEqual(im.info["dpi"], (dpi[1], dpi[1]))
|
||||
|
||||
|
@ -155,7 +176,7 @@ class TestFileTiff(PillowTestCase):
|
|||
TiffImagePlugin.PREFIXES.pop()
|
||||
|
||||
def test_bad_exif(self):
|
||||
i = Image.open("Tests/images/hopper_bad_exif.jpg")
|
||||
with Image.open("Tests/images/hopper_bad_exif.jpg") as i:
|
||||
# Should not raise struct.error.
|
||||
self.assert_warning(UserWarning, i._getexif)
|
||||
|
||||
|
@ -238,12 +259,12 @@ class TestFileTiff(PillowTestCase):
|
|||
["Tests/images/multipage-lastframe.tif", 1],
|
||||
["Tests/images/multipage.tiff", 3],
|
||||
]:
|
||||
im = Image.open(path)
|
||||
with Image.open(path) as im:
|
||||
self.assertEqual(im.n_frames, n_frames)
|
||||
self.assertEqual(im.is_animated, n_frames != 1)
|
||||
|
||||
def test_eoferror(self):
|
||||
im = Image.open("Tests/images/multipage-lastframe.tif")
|
||||
with Image.open("Tests/images/multipage-lastframe.tif") as im:
|
||||
n_frames = im.n_frames
|
||||
|
||||
# Test seeking past the last frame
|
||||
|
@ -255,7 +276,7 @@ class TestFileTiff(PillowTestCase):
|
|||
|
||||
def test_multipage(self):
|
||||
# issue #862
|
||||
im = Image.open("Tests/images/multipage.tiff")
|
||||
with Image.open("Tests/images/multipage.tiff") as im:
|
||||
# file is a multipage tiff: 10x10 green, 10x10 red, 20x20 blue
|
||||
|
||||
im.seek(0)
|
||||
|
@ -285,7 +306,7 @@ class TestFileTiff(PillowTestCase):
|
|||
|
||||
def test___str__(self):
|
||||
filename = "Tests/images/pil136.tiff"
|
||||
im = Image.open(filename)
|
||||
with Image.open(filename) as im:
|
||||
|
||||
# Act
|
||||
ret = str(im.ifd)
|
||||
|
@ -296,7 +317,7 @@ class TestFileTiff(PillowTestCase):
|
|||
def test_dict(self):
|
||||
# Arrange
|
||||
filename = "Tests/images/pil136.tiff"
|
||||
im = Image.open(filename)
|
||||
with Image.open(filename) as im:
|
||||
|
||||
# v2 interface
|
||||
v2_tags = {
|
||||
|
@ -336,7 +357,7 @@ class TestFileTiff(PillowTestCase):
|
|||
|
||||
def test__delitem__(self):
|
||||
filename = "Tests/images/pil136.tiff"
|
||||
im = Image.open(filename)
|
||||
with Image.open(filename) as im:
|
||||
len_before = len(dict(im.ifd))
|
||||
del im.ifd[256]
|
||||
len_after = len(dict(im.ifd))
|
||||
|
@ -369,13 +390,13 @@ class TestFileTiff(PillowTestCase):
|
|||
|
||||
def test_seek(self):
|
||||
filename = "Tests/images/pil136.tiff"
|
||||
im = Image.open(filename)
|
||||
with Image.open(filename) as im:
|
||||
im.seek(0)
|
||||
self.assertEqual(im.tell(), 0)
|
||||
|
||||
def test_seek_eof(self):
|
||||
filename = "Tests/images/pil136.tiff"
|
||||
im = Image.open(filename)
|
||||
with Image.open(filename) as im:
|
||||
self.assertEqual(im.tell(), 0)
|
||||
self.assertRaises(EOFError, im.seek, -1)
|
||||
self.assertRaises(EOFError, im.seek, 1)
|
||||
|
@ -439,7 +460,7 @@ class TestFileTiff(PillowTestCase):
|
|||
kwargs = {"resolution_unit": "inch", "x_resolution": 72, "y_resolution": 36}
|
||||
filename = self.tempfile("temp.tif")
|
||||
hopper("RGB").save(filename, **kwargs)
|
||||
im = Image.open(filename)
|
||||
with Image.open(filename) as im:
|
||||
|
||||
# legacy interface
|
||||
self.assertEqual(im.tag[X_RESOLUTION][0][0], 72)
|
||||
|
@ -480,8 +501,7 @@ class TestFileTiff(PillowTestCase):
|
|||
def test_strip_planar_raw_with_overviews(self):
|
||||
# gdaladdo tiff_strip_planar_raw2.tif 2 4 8 16
|
||||
infile = "Tests/images/tiff_strip_planar_raw_with_overviews.tif"
|
||||
im = Image.open(infile)
|
||||
|
||||
with Image.open(infile) as im:
|
||||
self.assert_image_equal_tofile(im, "Tests/images/tiff_adobe_deflate.png")
|
||||
|
||||
def test_tiled_planar_raw(self):
|
||||
|
@ -545,8 +565,7 @@ class TestFileTiff(PillowTestCase):
|
|||
# Try save-load round trip to make sure both handle icc_profile.
|
||||
tmpfile = self.tempfile("temp.tif")
|
||||
im.save(tmpfile, "TIFF", compression="raw")
|
||||
reloaded = Image.open(tmpfile)
|
||||
|
||||
with Image.open(tmpfile) as reloaded:
|
||||
self.assertEqual(b"Dummy value", reloaded.info["icc_profile"])
|
||||
|
||||
def test_close_on_load_exclusive(self):
|
||||
|
|
|
@ -52,7 +52,7 @@ class TestFileTiffMetadata(PillowTestCase):
|
|||
|
||||
img.save(f, tiffinfo=info)
|
||||
|
||||
loaded = Image.open(f)
|
||||
with Image.open(f) as loaded:
|
||||
|
||||
self.assertEqual(loaded.tag[ImageJMetaDataByteCounts], (len(bindata),))
|
||||
self.assertEqual(loaded.tag_v2[ImageJMetaDataByteCounts], (len(bindata),))
|
||||
|
@ -72,13 +72,17 @@ class TestFileTiffMetadata(PillowTestCase):
|
|||
|
||||
info[ImageJMetaDataByteCounts] = (8, len(bindata) - 8)
|
||||
img.save(f, tiffinfo=info)
|
||||
loaded = Image.open(f)
|
||||
with Image.open(f) as loaded:
|
||||
|
||||
self.assertEqual(loaded.tag[ImageJMetaDataByteCounts], (8, len(bindata) - 8))
|
||||
self.assertEqual(loaded.tag_v2[ImageJMetaDataByteCounts], (8, len(bindata) - 8))
|
||||
self.assertEqual(
|
||||
loaded.tag[ImageJMetaDataByteCounts], (8, len(bindata) - 8)
|
||||
)
|
||||
self.assertEqual(
|
||||
loaded.tag_v2[ImageJMetaDataByteCounts], (8, len(bindata) - 8)
|
||||
)
|
||||
|
||||
def test_read_metadata(self):
|
||||
img = Image.open("Tests/images/hopper_g4.tif")
|
||||
with Image.open("Tests/images/hopper_g4.tif") as img:
|
||||
|
||||
self.assertEqual(
|
||||
{
|
||||
|
@ -131,7 +135,7 @@ class TestFileTiffMetadata(PillowTestCase):
|
|||
f = self.tempfile("temp.tiff")
|
||||
img.save(f, tiffinfo=img.tag)
|
||||
|
||||
loaded = Image.open(f)
|
||||
with Image.open(f) as loaded:
|
||||
|
||||
original = img.tag_v2.named()
|
||||
reloaded = loaded.tag_v2.named()
|
||||
|
@ -187,7 +191,7 @@ class TestFileTiffMetadata(PillowTestCase):
|
|||
out = self.tempfile("temp.tiff")
|
||||
|
||||
im.save(out)
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
self.assertNotIsInstance(im.info["icc_profile"], tuple)
|
||||
self.assertEqual(im.info["icc_profile"], reloaded.info["icc_profile"])
|
||||
|
||||
|
@ -196,7 +200,7 @@ class TestFileTiffMetadata(PillowTestCase):
|
|||
# We should be able to load this,
|
||||
# but probably won't be able to save it.
|
||||
|
||||
im = Image.open("Tests/images/hopper.iccprofile_binary.tif")
|
||||
with Image.open("Tests/images/hopper.iccprofile_binary.tif") as im:
|
||||
self.assertEqual(im.tag_v2.tagtype[34675], 1)
|
||||
self.assertTrue(im.info["icc_profile"])
|
||||
|
||||
|
@ -218,7 +222,7 @@ class TestFileTiffMetadata(PillowTestCase):
|
|||
out = self.tempfile("temp.tiff")
|
||||
im.save(out, tiffinfo=info, compression="raw")
|
||||
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
self.assertEqual(0, reloaded.tag_v2[41988].numerator)
|
||||
self.assertEqual(0, reloaded.tag_v2[41988].denominator)
|
||||
|
||||
|
@ -243,7 +247,7 @@ class TestFileTiffMetadata(PillowTestCase):
|
|||
self.assertIsInstance(im.tag_v2[34377][0], bytes)
|
||||
out = self.tempfile("temp.tiff")
|
||||
im.save(out)
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
self.assertEqual(len(reloaded.tag_v2[34377]), 1)
|
||||
self.assertIsInstance(reloaded.tag_v2[34377][0], bytes)
|
||||
|
||||
|
|
|
@ -158,7 +158,7 @@ class TestFileWebp(PillowTestCase):
|
|||
HAVE_WEBP and _webp.HAVE_WEBPANIM, "WebP save all not available"
|
||||
)
|
||||
def test_background_from_gif(self):
|
||||
im = Image.open("Tests/images/chi.gif")
|
||||
with Image.open("Tests/images/chi.gif") as im:
|
||||
original_value = im.convert("RGB").getpixel((1, 1))
|
||||
|
||||
# Save as WEBP
|
||||
|
@ -169,7 +169,7 @@ class TestFileWebp(PillowTestCase):
|
|||
out_gif = self.tempfile("temp.gif")
|
||||
Image.open(out_webp).save(out_gif)
|
||||
|
||||
reread = Image.open(out_gif)
|
||||
with Image.open(out_gif) as reread:
|
||||
reread_value = reread.convert("RGB").getpixel((1, 1))
|
||||
difference = sum(
|
||||
[abs(original_value[i] - reread_value[i]) for i in range(0, 3)]
|
||||
|
|
|
@ -103,7 +103,8 @@ class TestFileWebpAlpha(PillowTestCase):
|
|||
|
||||
temp_file = self.tempfile("temp.webp")
|
||||
file_path = "Tests/images/transparent.gif"
|
||||
Image.open(file_path).save(temp_file)
|
||||
with Image.open(file_path) as im:
|
||||
im.save(temp_file)
|
||||
image = Image.open(temp_file)
|
||||
|
||||
self.assertEqual(image.mode, "RGBA")
|
||||
|
@ -112,6 +113,7 @@ class TestFileWebpAlpha(PillowTestCase):
|
|||
|
||||
image.load()
|
||||
image.getdata()
|
||||
target = Image.open(file_path).convert("RGBA")
|
||||
with Image.open(file_path) as im:
|
||||
target = im.convert("RGBA")
|
||||
|
||||
self.assert_image_similar(image, target, 25.0)
|
||||
|
|
|
@ -28,11 +28,11 @@ class TestFileWebpAnimation(PillowTestCase):
|
|||
attributes correctly.
|
||||
"""
|
||||
|
||||
im = Image.open("Tests/images/hopper.webp")
|
||||
with Image.open("Tests/images/hopper.webp") as im:
|
||||
self.assertEqual(im.n_frames, 1)
|
||||
self.assertFalse(im.is_animated)
|
||||
|
||||
im = Image.open("Tests/images/iss634.webp")
|
||||
with Image.open("Tests/images/iss634.webp") as im:
|
||||
self.assertEqual(im.n_frames, 42)
|
||||
self.assertTrue(im.is_animated)
|
||||
|
||||
|
@ -43,7 +43,7 @@ class TestFileWebpAnimation(PillowTestCase):
|
|||
visually similar.
|
||||
"""
|
||||
|
||||
orig = Image.open("Tests/images/iss634.gif")
|
||||
with Image.open("Tests/images/iss634.gif") as orig:
|
||||
self.assertGreater(orig.n_frames, 1)
|
||||
|
||||
temp_file = self.tempfile("temp.webp")
|
||||
|
|
|
@ -24,7 +24,7 @@ class TestFileWebpMetadata(PillowTestCase):
|
|||
def test_read_exif_metadata(self):
|
||||
|
||||
file_path = "Tests/images/flower.webp"
|
||||
image = Image.open(file_path)
|
||||
with Image.open(file_path) as image:
|
||||
|
||||
self.assertEqual(image.format, "WEBP")
|
||||
exif_data = image.info.get("exif", None)
|
||||
|
@ -35,7 +35,7 @@ class TestFileWebpMetadata(PillowTestCase):
|
|||
# camera make
|
||||
self.assertEqual(exif[271], "Canon")
|
||||
|
||||
jpeg_image = Image.open("Tests/images/flower.jpg")
|
||||
with Image.open("Tests/images/flower.jpg") as jpeg_image:
|
||||
expected_exif = jpeg_image.info["exif"]
|
||||
|
||||
self.assertEqual(exif_data, expected_exif)
|
||||
|
@ -60,14 +60,14 @@ class TestFileWebpMetadata(PillowTestCase):
|
|||
def test_read_icc_profile(self):
|
||||
|
||||
file_path = "Tests/images/flower2.webp"
|
||||
image = Image.open(file_path)
|
||||
with Image.open(file_path) as image:
|
||||
|
||||
self.assertEqual(image.format, "WEBP")
|
||||
self.assertTrue(image.info.get("icc_profile", None))
|
||||
|
||||
icc = image.info["icc_profile"]
|
||||
|
||||
jpeg_image = Image.open("Tests/images/flower2.jpg")
|
||||
with Image.open("Tests/images/flower2.jpg") as jpeg_image:
|
||||
expected_icc = jpeg_image.info["icc_profile"]
|
||||
|
||||
self.assertEqual(icc, expected_icc)
|
||||
|
@ -126,7 +126,7 @@ class TestFileWebpMetadata(PillowTestCase):
|
|||
xmp=xmp_data,
|
||||
)
|
||||
|
||||
image = Image.open(temp_file)
|
||||
with Image.open(temp_file) as image:
|
||||
self.assertIn("icc_profile", image.info)
|
||||
self.assertIn("exif", image.info)
|
||||
self.assertIn("xmp", image.info)
|
||||
|
|
|
@ -7,7 +7,7 @@ class TestFileWmf(PillowTestCase):
|
|||
def test_load_raw(self):
|
||||
|
||||
# Test basic EMF open and rendering
|
||||
im = Image.open("Tests/images/drawing.emf")
|
||||
with Image.open("Tests/images/drawing.emf") as im:
|
||||
if hasattr(Image.core, "drawwmf"):
|
||||
# Currently, support for WMF/EMF is Windows-only
|
||||
im.load()
|
||||
|
@ -17,7 +17,7 @@ class TestFileWmf(PillowTestCase):
|
|||
self.assert_image_similar(im, imref, 0)
|
||||
|
||||
# Test basic WMF open and rendering
|
||||
im = Image.open("Tests/images/drawing.wmf")
|
||||
with Image.open("Tests/images/drawing.wmf") as im:
|
||||
if hasattr(Image.core, "drawwmf"):
|
||||
# Currently, support for WMF/EMF is Windows-only
|
||||
im.load()
|
||||
|
@ -46,11 +46,11 @@ class TestFileWmf(PillowTestCase):
|
|||
|
||||
def test_load_dpi_rounding(self):
|
||||
# Round up
|
||||
im = Image.open("Tests/images/drawing.emf")
|
||||
with Image.open("Tests/images/drawing.emf") as im:
|
||||
self.assertEqual(im.info["dpi"], 1424)
|
||||
|
||||
# Round down
|
||||
im = Image.open("Tests/images/drawing_roundDown.emf")
|
||||
with Image.open("Tests/images/drawing_roundDown.emf") as im:
|
||||
self.assertEqual(im.info["dpi"], 1426)
|
||||
|
||||
def test_save(self):
|
||||
|
|
|
@ -42,7 +42,7 @@ class TestFileXbm(PillowTestCase):
|
|||
filename = "Tests/images/hopper.xbm"
|
||||
|
||||
# Act
|
||||
im = Image.open(filename)
|
||||
with Image.open(filename) as im:
|
||||
|
||||
# Assert
|
||||
self.assertEqual(im.mode, "1")
|
||||
|
@ -54,7 +54,7 @@ class TestFileXbm(PillowTestCase):
|
|||
filename = "Tests/images/hopper_underscore.xbm"
|
||||
|
||||
# Act
|
||||
im = Image.open(filename)
|
||||
with Image.open(filename) as im:
|
||||
|
||||
# Assert
|
||||
self.assertEqual(im.mode, "1")
|
||||
|
|
|
@ -23,7 +23,7 @@ class TestFileXpm(PillowTestCase):
|
|||
|
||||
def test_load_read(self):
|
||||
# Arrange
|
||||
im = Image.open(TEST_FILE)
|
||||
with Image.open(TEST_FILE) as im:
|
||||
dummy_bytes = 1
|
||||
|
||||
# Act
|
||||
|
|
|
@ -97,7 +97,7 @@ class TestImage(PillowTestCase):
|
|||
def test_pathlib(self):
|
||||
from PIL.Image import Path
|
||||
|
||||
im = Image.open(Path("Tests/images/multipage-mmap.tiff"))
|
||||
with Image.open(Path("Tests/images/multipage-mmap.tiff")) as im:
|
||||
self.assertEqual(im.mode, "P")
|
||||
self.assertEqual(im.size, (10, 10))
|
||||
|
||||
|
@ -346,7 +346,8 @@ class TestImage(PillowTestCase):
|
|||
def test_registered_extensions(self):
|
||||
# Arrange
|
||||
# Open an image to trigger plugin registration
|
||||
Image.open("Tests/images/rgb.jpg")
|
||||
with Image.open("Tests/images/rgb.jpg"):
|
||||
pass
|
||||
|
||||
# Act
|
||||
extensions = Image.registered_extensions()
|
||||
|
@ -448,7 +449,7 @@ class TestImage(PillowTestCase):
|
|||
|
||||
def test_offset_not_implemented(self):
|
||||
# Arrange
|
||||
im = hopper()
|
||||
with hopper() as im:
|
||||
|
||||
# Act / Assert
|
||||
self.assertRaises(NotImplementedError, im.offset, None)
|
||||
|
@ -522,7 +523,7 @@ class TestImage(PillowTestCase):
|
|||
|
||||
def test_remap_palette(self):
|
||||
# Test illegal image mode
|
||||
im = hopper()
|
||||
with hopper() as im:
|
||||
self.assertRaises(ValueError, im.remap_palette, None)
|
||||
|
||||
def test__new(self):
|
||||
|
@ -587,7 +588,7 @@ class TestImage(PillowTestCase):
|
|||
|
||||
def test_overrun(self):
|
||||
for file in ["fli_overrun.bin", "sgi_overrun.bin", "pcx_overrun.bin"]:
|
||||
im = Image.open(os.path.join("Tests/images", file))
|
||||
with Image.open(os.path.join("Tests/images", file)) as im:
|
||||
try:
|
||||
im.load()
|
||||
self.assertFail()
|
||||
|
|
|
@ -144,7 +144,7 @@ class TestImageConvert(PillowTestCase):
|
|||
|
||||
def test_gif_with_rgba_palette_to_p(self):
|
||||
# See https://github.com/python-pillow/Pillow/issues/2433
|
||||
im = Image.open("Tests/images/hopper.gif")
|
||||
with Image.open("Tests/images/hopper.gif") as im:
|
||||
im.info["transparency"] = 255
|
||||
im.load()
|
||||
self.assertEqual(im.palette.mode, "RGBA")
|
||||
|
|
|
@ -5,12 +5,15 @@ from .test_imageqt import PillowQtTestCase
|
|||
|
||||
|
||||
class TestFromQImage(PillowQtTestCase, PillowTestCase):
|
||||
|
||||
files_to_test = [
|
||||
def setUp(self):
|
||||
super(TestFromQImage, self).setUp()
|
||||
self.files_to_test = [
|
||||
hopper(),
|
||||
Image.open("Tests/images/transparent.png"),
|
||||
Image.open("Tests/images/7x13.png"),
|
||||
]
|
||||
for im in self.files_to_test:
|
||||
self.addCleanup(im.close)
|
||||
|
||||
def roundtrip(self, expected):
|
||||
# PIL -> Qt
|
||||
|
|
|
@ -6,7 +6,7 @@ from .helper import PillowTestCase, hopper
|
|||
class TestImageMode(PillowTestCase):
|
||||
def test_sanity(self):
|
||||
|
||||
im = hopper()
|
||||
with hopper() as im:
|
||||
im.mode
|
||||
|
||||
from PIL import ImageMode
|
||||
|
|
|
@ -148,5 +148,5 @@ class TestImageResize(PillowTestCase):
|
|||
resize(mode, (188, 214))
|
||||
|
||||
# Test unknown resampling filter
|
||||
im = hopper()
|
||||
with hopper() as im:
|
||||
self.assertRaises(ValueError, im.resize, (10, 10), "unknown")
|
||||
|
|
|
@ -39,11 +39,11 @@ class TestImageThumbnail(PillowTestCase):
|
|||
|
||||
def test_no_resize(self):
|
||||
# Check that draft() can resize the image to the destination size
|
||||
im = Image.open("Tests/images/hopper.jpg")
|
||||
with Image.open("Tests/images/hopper.jpg") as im:
|
||||
im.draft(None, (64, 64))
|
||||
self.assertEqual(im.size, (64, 64))
|
||||
|
||||
# Test thumbnail(), where only draft() is necessary to resize the image
|
||||
im = Image.open("Tests/images/hopper.jpg")
|
||||
with Image.open("Tests/images/hopper.jpg") as im:
|
||||
im.thumbnail((64, 64))
|
||||
self.assert_image(im, im.mode, (64, 64))
|
||||
|
|
|
@ -156,11 +156,11 @@ class TestImageTransform(PillowTestCase):
|
|||
self.test_mesh()
|
||||
|
||||
def test_missing_method_data(self):
|
||||
im = hopper()
|
||||
with hopper() as im:
|
||||
self.assertRaises(ValueError, im.transform, (100, 100), None)
|
||||
|
||||
def test_unknown_resampling_filter(self):
|
||||
im = hopper()
|
||||
with hopper() as im:
|
||||
(w, h) = im.size
|
||||
for resample in (Image.BOX, "unknown"):
|
||||
self.assertRaises(
|
||||
|
|
|
@ -58,7 +58,7 @@ class TestImageCms(PillowTestCase):
|
|||
i = ImageCms.applyTransform(hopper(), t)
|
||||
self.assert_image(i, "RGB", (128, 128))
|
||||
|
||||
i = hopper()
|
||||
with hopper() as i:
|
||||
t = ImageCms.buildTransform(SRGB, SRGB, "RGB", "RGB")
|
||||
ImageCms.applyTransform(hopper(), t, inPlace=True)
|
||||
self.assert_image(i, "RGB", (128, 128))
|
||||
|
@ -151,7 +151,7 @@ class TestImageCms(PillowTestCase):
|
|||
def test_extensions(self):
|
||||
# extensions
|
||||
|
||||
i = Image.open("Tests/images/rgb.jpg")
|
||||
with Image.open("Tests/images/rgb.jpg") as i:
|
||||
p = ImageCms.getOpenProfile(BytesIO(i.info["icc_profile"]))
|
||||
self.assertEqual(
|
||||
ImageCms.getProfileName(p).strip(),
|
||||
|
@ -166,8 +166,9 @@ class TestImageCms(PillowTestCase):
|
|||
self.assertRaises(ValueError, t.apply_in_place, hopper("RGBA"))
|
||||
|
||||
# the procedural pyCMS API uses PyCMSError for all sorts of errors
|
||||
with hopper() as im:
|
||||
self.assertRaises(
|
||||
ImageCms.PyCMSError, ImageCms.profileToProfile, hopper(), "foo", "bar"
|
||||
ImageCms.PyCMSError, ImageCms.profileToProfile, im, "foo", "bar"
|
||||
)
|
||||
self.assertRaises(
|
||||
ImageCms.PyCMSError, ImageCms.buildTransform, "foo", "bar", "RGB", "RGB"
|
||||
|
@ -266,7 +267,7 @@ class TestImageCms(PillowTestCase):
|
|||
self.assert_image_similar(hopper(), out, 2)
|
||||
|
||||
def test_profile_tobytes(self):
|
||||
i = Image.open("Tests/images/rgb.jpg")
|
||||
with Image.open("Tests/images/rgb.jpg") as i:
|
||||
p = ImageCms.getOpenProfile(BytesIO(i.info["icc_profile"]))
|
||||
|
||||
p2 = ImageCms.getOpenProfile(BytesIO(p.tobytes()))
|
||||
|
|
|
@ -45,7 +45,7 @@ class TestImageDraw(PillowTestCase):
|
|||
draw.rectangle(list(range(4)))
|
||||
|
||||
def test_valueerror(self):
|
||||
im = Image.open("Tests/images/chi.gif")
|
||||
with Image.open("Tests/images/chi.gif") as im:
|
||||
|
||||
draw = ImageDraw.Draw(im)
|
||||
draw.line((0, 0), fill=(0, 0, 0))
|
||||
|
|
|
@ -115,7 +115,7 @@ class TestImageFile(PillowTestCase):
|
|||
if "zip_encoder" not in codecs:
|
||||
self.skipTest("PNG (zlib) encoder not available")
|
||||
|
||||
im = Image.open("Tests/images/truncated_image.png")
|
||||
with Image.open("Tests/images/truncated_image.png") as im:
|
||||
with self.assertRaises(IOError):
|
||||
im.load()
|
||||
|
||||
|
@ -258,7 +258,7 @@ class TestPyDecoder(PillowTestCase):
|
|||
exif[40963] = 455
|
||||
exif[11] = "Pillow test"
|
||||
im.save(out, exif=exif)
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
reloaded_exif = reloaded.getexif()
|
||||
self.assertEqual(reloaded_exif[258], 8)
|
||||
self.assertNotIn(40960, exif)
|
||||
|
@ -278,7 +278,7 @@ class TestPyDecoder(PillowTestCase):
|
|||
exif[40963] = 455
|
||||
exif[305] = "Pillow test"
|
||||
im.save(out, exif=exif)
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
reloaded_exif = reloaded.getexif()
|
||||
self.assertEqual(reloaded_exif[258], 8)
|
||||
self.assertNotIn(40960, exif)
|
||||
|
@ -300,7 +300,7 @@ class TestPyDecoder(PillowTestCase):
|
|||
exif[305] = "Pillow test"
|
||||
|
||||
def check_exif():
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
reloaded_exif = reloaded.getexif()
|
||||
self.assertEqual(reloaded_exif[258], 8)
|
||||
self.assertEqual(reloaded_exif[40963], 455)
|
||||
|
@ -323,23 +323,13 @@ class TestPyDecoder(PillowTestCase):
|
|||
exif[305] = "Pillow test"
|
||||
im.save(out, exif=exif)
|
||||
|
||||
reloaded = Image.open(out)
|
||||
with Image.open(out) as reloaded:
|
||||
reloaded_exif = reloaded.getexif()
|
||||
self.assertEqual(reloaded_exif, {258: 8, 40963: 455, 305: "Pillow test"})
|
||||
|
||||
def test_exif_interop(self):
|
||||
im = Image.open("Tests/images/flower.jpg")
|
||||
with Image.open("Tests/images/flower.jpg") as im:
|
||||
exif = im.getexif()
|
||||
self.assertEqual(
|
||||
exif.get_ifd(0xA005), {1: "R98", 2: b"0100", 4097: 2272, 4098: 1704}
|
||||
)
|
||||
|
||||
def test_exif_shared(self):
|
||||
im = Image.open("Tests/images/exif.png")
|
||||
exif = im.getexif()
|
||||
self.assertIs(im.getexif(), exif)
|
||||
|
||||
def test_exif_str(self):
|
||||
im = Image.open("Tests/images/exif.png")
|
||||
exif = im.getexif()
|
||||
self.assertEqual(str(exif), "{274: 1}")
|
||||
|
|
|
@ -2,57 +2,61 @@ from PIL import Image, ImageFilter
|
|||
|
||||
from .helper import PillowTestCase
|
||||
|
||||
im = Image.open("Tests/images/hopper.ppm")
|
||||
snakes = Image.open("Tests/images/color_snakes.png")
|
||||
|
||||
|
||||
class TestImageOpsUsm(PillowTestCase):
|
||||
def setUp(self):
|
||||
super(TestImageOpsUsm, self).setUp()
|
||||
self.im = Image.open("Tests/images/hopper.ppm")
|
||||
self.addCleanup(self.im.close)
|
||||
self.snakes = Image.open("Tests/images/color_snakes.png")
|
||||
self.addCleanup(self.snakes.close)
|
||||
|
||||
def test_filter_api(self):
|
||||
|
||||
test_filter = ImageFilter.GaussianBlur(2.0)
|
||||
i = im.filter(test_filter)
|
||||
i = self.im.filter(test_filter)
|
||||
self.assertEqual(i.mode, "RGB")
|
||||
self.assertEqual(i.size, (128, 128))
|
||||
|
||||
test_filter = ImageFilter.UnsharpMask(2.0, 125, 8)
|
||||
i = im.filter(test_filter)
|
||||
i = self.im.filter(test_filter)
|
||||
self.assertEqual(i.mode, "RGB")
|
||||
self.assertEqual(i.size, (128, 128))
|
||||
|
||||
def test_usm_formats(self):
|
||||
|
||||
usm = ImageFilter.UnsharpMask
|
||||
self.assertRaises(ValueError, im.convert("1").filter, usm)
|
||||
im.convert("L").filter(usm)
|
||||
self.assertRaises(ValueError, im.convert("I").filter, usm)
|
||||
self.assertRaises(ValueError, im.convert("F").filter, usm)
|
||||
im.convert("RGB").filter(usm)
|
||||
im.convert("RGBA").filter(usm)
|
||||
im.convert("CMYK").filter(usm)
|
||||
self.assertRaises(ValueError, im.convert("YCbCr").filter, usm)
|
||||
self.assertRaises(ValueError, self.im.convert("1").filter, usm)
|
||||
self.im.convert("L").filter(usm)
|
||||
self.assertRaises(ValueError, self.im.convert("I").filter, usm)
|
||||
self.assertRaises(ValueError, self.im.convert("F").filter, usm)
|
||||
self.im.convert("RGB").filter(usm)
|
||||
self.im.convert("RGBA").filter(usm)
|
||||
self.im.convert("CMYK").filter(usm)
|
||||
self.assertRaises(ValueError, self.im.convert("YCbCr").filter, usm)
|
||||
|
||||
def test_blur_formats(self):
|
||||
|
||||
blur = ImageFilter.GaussianBlur
|
||||
self.assertRaises(ValueError, im.convert("1").filter, blur)
|
||||
blur(im.convert("L"))
|
||||
self.assertRaises(ValueError, im.convert("I").filter, blur)
|
||||
self.assertRaises(ValueError, im.convert("F").filter, blur)
|
||||
im.convert("RGB").filter(blur)
|
||||
im.convert("RGBA").filter(blur)
|
||||
im.convert("CMYK").filter(blur)
|
||||
self.assertRaises(ValueError, im.convert("YCbCr").filter, blur)
|
||||
self.assertRaises(ValueError, self.im.convert("1").filter, blur)
|
||||
blur(self.im.convert("L"))
|
||||
self.assertRaises(ValueError, self.im.convert("I").filter, blur)
|
||||
self.assertRaises(ValueError, self.im.convert("F").filter, blur)
|
||||
self.im.convert("RGB").filter(blur)
|
||||
self.im.convert("RGBA").filter(blur)
|
||||
self.im.convert("CMYK").filter(blur)
|
||||
self.assertRaises(ValueError, self.im.convert("YCbCr").filter, blur)
|
||||
|
||||
def test_usm_accuracy(self):
|
||||
|
||||
src = snakes.convert("RGB")
|
||||
src = self.snakes.convert("RGB")
|
||||
i = src.filter(ImageFilter.UnsharpMask(5, 1024, 0))
|
||||
# Image should not be changed because it have only 0 and 255 levels.
|
||||
self.assertEqual(i.tobytes(), src.tobytes())
|
||||
|
||||
def test_blur_accuracy(self):
|
||||
|
||||
i = snakes.filter(ImageFilter.GaussianBlur(0.4))
|
||||
i = self.snakes.filter(ImageFilter.GaussianBlur(0.4))
|
||||
# These pixels surrounded with pixels with 255 intensity.
|
||||
# They must be very close to 255.
|
||||
for x, y, c in [
|
||||
|
|
|
@ -24,7 +24,7 @@ class TestImageSequence(PillowTestCase):
|
|||
self.assertRaises(AttributeError, ImageSequence.Iterator, 0)
|
||||
|
||||
def test_iterator(self):
|
||||
im = Image.open("Tests/images/multipage.tiff")
|
||||
with Image.open("Tests/images/multipage.tiff") as im:
|
||||
i = ImageSequence.Iterator(im)
|
||||
for index in range(0, im.n_frames):
|
||||
self.assertEqual(i[index], next(i))
|
||||
|
@ -32,13 +32,13 @@ class TestImageSequence(PillowTestCase):
|
|||
self.assertRaises(StopIteration, next, i)
|
||||
|
||||
def test_iterator_min_frame(self):
|
||||
im = Image.open("Tests/images/hopper.psd")
|
||||
with Image.open("Tests/images/hopper.psd") as im:
|
||||
i = ImageSequence.Iterator(im)
|
||||
for index in range(1, im.n_frames):
|
||||
self.assertEqual(i[index], next(i))
|
||||
|
||||
def _test_multipage_tiff(self):
|
||||
im = Image.open("Tests/images/multipage.tiff")
|
||||
with Image.open("Tests/images/multipage.tiff") as im:
|
||||
for index, frame in enumerate(ImageSequence.Iterator(im)):
|
||||
frame.load()
|
||||
self.assertEqual(index, im.tell())
|
||||
|
@ -58,7 +58,7 @@ class TestImageSequence(PillowTestCase):
|
|||
TiffImagePlugin.READ_LIBTIFF = False
|
||||
|
||||
def test_consecutive(self):
|
||||
im = Image.open("Tests/images/multipage.tiff")
|
||||
with Image.open("Tests/images/multipage.tiff") as im:
|
||||
firstFrame = None
|
||||
for frame in ImageSequence.Iterator(im):
|
||||
if firstFrame is None:
|
||||
|
@ -69,7 +69,7 @@ class TestImageSequence(PillowTestCase):
|
|||
|
||||
def test_palette_mmap(self):
|
||||
# Using mmap in ImageFile can require to reload the palette.
|
||||
im = Image.open("Tests/images/multipage-mmap.tiff")
|
||||
with Image.open("Tests/images/multipage-mmap.tiff") as im:
|
||||
color1 = im.getpalette()[0:3]
|
||||
im.seek(0)
|
||||
color2 = im.getpalette()[0:3]
|
||||
|
@ -77,7 +77,7 @@ class TestImageSequence(PillowTestCase):
|
|||
|
||||
def test_all_frames(self):
|
||||
# Test a single image
|
||||
im = Image.open("Tests/images/iss634.gif")
|
||||
with Image.open("Tests/images/iss634.gif") as im:
|
||||
ims = ImageSequence.all_frames(im)
|
||||
|
||||
self.assertEqual(len(ims), 42)
|
||||
|
|
|
@ -27,7 +27,7 @@ class TestImageShow(PillowTestCase):
|
|||
ImageShow.register(viewer, -1)
|
||||
|
||||
for mode in ("1", "I;16", "LA", "RGB", "RGBA"):
|
||||
im = hopper(mode)
|
||||
with hopper() as im:
|
||||
self.assertTrue(ImageShow.show(im))
|
||||
self.assertTrue(viewer.methodCalled)
|
||||
|
||||
|
|
|
@ -26,13 +26,15 @@ path = "Tests/images/hopper.jpg"
|
|||
|
||||
class TestLocale(PillowTestCase):
|
||||
def test_sanity(self):
|
||||
Image.open(path)
|
||||
with Image.open(path):
|
||||
pass
|
||||
try:
|
||||
locale.setlocale(locale.LC_ALL, "polish")
|
||||
except locale.Error:
|
||||
unittest.skip("Polish locale not available")
|
||||
|
||||
try:
|
||||
Image.open(path)
|
||||
with Image.open(path):
|
||||
pass
|
||||
finally:
|
||||
locale.setlocale(locale.LC_ALL, (None, None))
|
||||
|
|
|
@ -23,7 +23,7 @@ class TestMap(PillowTestCase):
|
|||
Image.MAX_IMAGE_PIXELS = None
|
||||
|
||||
# This image hits the offset test.
|
||||
im = Image.open("Tests/images/l2rgb_read.bmp")
|
||||
with Image.open("Tests/images/l2rgb_read.bmp") as im:
|
||||
with self.assertRaises((ValueError, MemoryError, IOError)):
|
||||
im.load()
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@ class TestModeI16(PillowTestCase):
|
|||
filename = self.tempfile("temp.im")
|
||||
imIn.save(filename)
|
||||
|
||||
imOut = Image.open(filename)
|
||||
with Image.open(filename) as imOut:
|
||||
|
||||
self.verify(imIn)
|
||||
self.verify(imOut)
|
||||
|
|
|
@ -24,7 +24,8 @@ class TestShellInjection(PillowTestCase):
|
|||
dest_file = self.tempfile(filename)
|
||||
save_func(src_img, 0, dest_file)
|
||||
# If file can't be opened, shell injection probably occurred
|
||||
Image.open(dest_file).load()
|
||||
with Image.open(dest_file) as im:
|
||||
im.load()
|
||||
|
||||
@unittest.skipUnless(djpeg_available(), "djpeg not available")
|
||||
def test_load_djpeg_filename(self):
|
||||
|
@ -32,7 +33,7 @@ class TestShellInjection(PillowTestCase):
|
|||
src_file = self.tempfile(filename)
|
||||
shutil.copy(TEST_JPG, src_file)
|
||||
|
||||
im = Image.open(src_file)
|
||||
with Image.open(src_file) as im:
|
||||
im.load_djpeg()
|
||||
|
||||
@unittest.skipUnless(cjpeg_available(), "cjpeg not available")
|
||||
|
@ -42,10 +43,12 @@ class TestShellInjection(PillowTestCase):
|
|||
|
||||
@unittest.skipUnless(netpbm_available(), "netpbm not available")
|
||||
def test_save_netpbm_filename_bmp_mode(self):
|
||||
im = Image.open(TEST_GIF).convert("RGB")
|
||||
with Image.open(TEST_GIF) as im:
|
||||
im = im.convert("RGB")
|
||||
self.assert_save_filename_check(im, GifImagePlugin._save_netpbm)
|
||||
|
||||
@unittest.skipUnless(netpbm_available(), "netpbm not available")
|
||||
def test_save_netpbm_filename_l_mode(self):
|
||||
im = Image.open(TEST_GIF).convert("L")
|
||||
with Image.open(TEST_GIF) as im:
|
||||
im = im.convert("L")
|
||||
self.assert_save_filename_check(im, GifImagePlugin._save_netpbm)
|
||||
|
|
|
@ -54,5 +54,7 @@ class Test_IFDRational(PillowTestCase):
|
|||
res = IFDRational(301, 1)
|
||||
im.save(out, dpi=(res, res), compression="raw")
|
||||
|
||||
reloaded = Image.open(out)
|
||||
self.assertEqual(float(IFDRational(301, 1)), float(reloaded.tag_v2[282]))
|
||||
with Image.open(out) as reloaded:
|
||||
self.assertEqual(
|
||||
float(IFDRational(301, 1)), float(reloaded.tag_v2[282])
|
||||
)
|
||||
|
|
|
@ -99,7 +99,7 @@ Create JPEG thumbnails
|
|||
outfile = os.path.splitext(infile)[0] + ".thumbnail"
|
||||
if infile != outfile:
|
||||
try:
|
||||
im = Image.open(infile)
|
||||
with Image.open(infile) as im:
|
||||
im.thumbnail(size)
|
||||
im.save(outfile, "JPEG")
|
||||
except IOError:
|
||||
|
@ -267,7 +267,8 @@ Converting between modes
|
|||
::
|
||||
|
||||
from PIL import Image
|
||||
im = Image.open("hopper.ppm").convert("L")
|
||||
with Image.open("hopper.ppm") as im:
|
||||
im = im.convert("L")
|
||||
|
||||
The library supports transformations between each supported mode and the “L”
|
||||
and “RGB” modes. To convert between other modes, you may have to use an
|
||||
|
@ -383,7 +384,7 @@ Reading sequences
|
|||
|
||||
from PIL import Image
|
||||
|
||||
im = Image.open("animation.gif")
|
||||
with Image.open("animation.gif") as im:
|
||||
im.seek(1) # skip to the second frame
|
||||
|
||||
try:
|
||||
|
@ -422,7 +423,7 @@ Drawing Postscript
|
|||
from PIL import Image
|
||||
from PIL import PSDraw
|
||||
|
||||
im = Image.open("hopper.ppm")
|
||||
with Image.open("hopper.ppm") as im:
|
||||
title = "hopper"
|
||||
box = (1*72, 2*72, 7*72, 10*72) # in points
|
||||
|
||||
|
@ -444,10 +445,12 @@ More on reading images
|
|||
|
||||
As described earlier, the :py:func:`~PIL.Image.open` function of the
|
||||
:py:mod:`~PIL.Image` module is used to open an image file. In most cases, you
|
||||
simply pass it the filename as an argument::
|
||||
simply pass it the filename as an argument. ``Image.open()`` can be used a
|
||||
context manager::
|
||||
|
||||
from PIL import Image
|
||||
im = Image.open("hopper.ppm")
|
||||
with Image.open("hopper.ppm") as im:
|
||||
...
|
||||
|
||||
If everything goes well, the result is an :py:class:`PIL.Image.Image` object.
|
||||
Otherwise, an :exc:`IOError` exception is raised.
|
||||
|
@ -513,8 +516,8 @@ This is only available for JPEG and MPO files.
|
|||
::
|
||||
|
||||
from PIL import Image
|
||||
from __future__ import print_function
|
||||
im = Image.open(file)
|
||||
|
||||
with Image.open(file) as im:
|
||||
print("original =", im.mode, im.size)
|
||||
|
||||
im.draft("L", (100, 100))
|
||||
|
|
|
@ -8,27 +8,25 @@ object, or a file-like object. Pillow uses the filename or ``Path`` to open a
|
|||
file, so for the rest of this article, they will all be treated as a file-like
|
||||
object.
|
||||
|
||||
The first four of these items are equivalent, the last is dangerous
|
||||
and may fail::
|
||||
The following are all equivalent::
|
||||
|
||||
from PIL import Image
|
||||
import io
|
||||
import pathlib
|
||||
|
||||
im = Image.open('test.jpg')
|
||||
with Image.open('test.jpg') as im:
|
||||
...
|
||||
|
||||
im2 = Image.open(pathlib.Path('test.jpg'))
|
||||
with Image.open(pathlib.Path('test.jpg')) as im2:
|
||||
...
|
||||
|
||||
f = open('test.jpg', 'rb')
|
||||
with open('test.jpg', 'rb') as f:
|
||||
im3 = Image.open(f)
|
||||
...
|
||||
|
||||
with open('test.jpg', 'rb') as f:
|
||||
im4 = Image.open(io.BytesIO(f.read()))
|
||||
|
||||
# Dangerous FAIL:
|
||||
with open('test.jpg', 'rb') as f:
|
||||
im5 = Image.open(f)
|
||||
im5.load() # FAILS, closed file
|
||||
...
|
||||
|
||||
If a filename or a path-like object is passed to Pillow, then the resulting
|
||||
file object opened by Pillow may also be closed by Pillow after the
|
||||
|
@ -38,13 +36,6 @@ have multiple frames.
|
|||
Pillow cannot in general close and reopen a file, so any access to
|
||||
that file needs to be prior to the close.
|
||||
|
||||
Issues
|
||||
------
|
||||
|
||||
* Using the file context manager to provide a file-like object to
|
||||
Pillow is dangerous unless the context of the image is limited to
|
||||
the context of the file.
|
||||
|
||||
Image Lifecycle
|
||||
---------------
|
||||
|
||||
|
@ -70,9 +61,9 @@ Image Lifecycle
|
|||
... # image operations here.
|
||||
|
||||
|
||||
The lifecycle of a single-frame image is relatively simple. The file
|
||||
must remain open until the ``load()`` or ``close()`` function is
|
||||
called.
|
||||
The lifecycle of a single-frame image is relatively simple. The file must
|
||||
remain open until the ``load()`` or ``close()`` function is called or the
|
||||
context manager exits.
|
||||
|
||||
Multi-frame images are more complicated. The ``load()`` method is not
|
||||
a terminal method, so it should not close the underlying file. In general,
|
||||
|
@ -87,14 +78,16 @@ Complications
|
|||
libtiff (if working on an actual file). Since libtiff closes the file
|
||||
descriptor internally, it is duplicated prior to passing it into libtiff.
|
||||
|
||||
* I don't think that there's any way to make this safe without
|
||||
changing the lazy loading::
|
||||
* After a file has been closed, operations that require file access will fail::
|
||||
|
||||
# Dangerous FAIL:
|
||||
with open('test.jpg', 'rb') as f:
|
||||
im5 = Image.open(f)
|
||||
im5.load() # FAILS, closed file
|
||||
|
||||
with Image.open('test.jpg') as im6:
|
||||
pass
|
||||
im6.load() # FAILS, closed file
|
||||
|
||||
|
||||
Proposed File Handling
|
||||
----------------------
|
||||
|
@ -104,5 +97,6 @@ Proposed File Handling
|
|||
|
||||
* ``Image.Image.seek()`` should never close the image file.
|
||||
|
||||
* Users of the library should call ``Image.Image.close()`` on any
|
||||
multi-frame image to ensure that the underlying file is closed.
|
||||
* Users of the library should use a context manager or call
|
||||
``Image.Image.close()`` on any image opened with a filename or ``Path``
|
||||
object to ensure that the underlying file is closed.
|
||||
|
|
|
@ -42,8 +42,8 @@ def testimage():
|
|||
|
||||
Or open existing files:
|
||||
|
||||
>>> im = Image.open("Tests/images/hopper.gif")
|
||||
>>> _info(im)
|
||||
>>> with Image.open("Tests/images/hopper.gif") as im:
|
||||
... _info(im)
|
||||
('GIF', 'P', (128, 128))
|
||||
>>> _info(Image.open("Tests/images/hopper.ppm"))
|
||||
('PPM', 'RGB', (128, 128))
|
||||
|
|
|
@ -622,11 +622,6 @@ class Image(object):
|
|||
# object is gone.
|
||||
self.im = deferred_error(ValueError("Operation on closed image"))
|
||||
|
||||
if sys.version_info.major >= 3:
|
||||
|
||||
def __del__(self):
|
||||
self.__exit__()
|
||||
|
||||
def _copy(self):
|
||||
self.load()
|
||||
self.im = self.im.copy()
|
||||
|
|
|
@ -102,6 +102,7 @@ class ImageFile(Image.Image):
|
|||
# can be overridden
|
||||
self._exclusive_fp = None
|
||||
|
||||
try:
|
||||
try:
|
||||
self._open()
|
||||
except (
|
||||
|
@ -111,13 +112,15 @@ class ImageFile(Image.Image):
|
|||
EOFError, # got header but not the first frame
|
||||
struct.error,
|
||||
) as v:
|
||||
# close the file only if we have opened it this constructor
|
||||
if self._exclusive_fp:
|
||||
self.fp.close()
|
||||
raise SyntaxError(v)
|
||||
|
||||
if not self.mode or self.size[0] <= 0:
|
||||
raise SyntaxError("not identified by this driver")
|
||||
except BaseException:
|
||||
# close the file only if we have opened it this constructor
|
||||
if self._exclusive_fp:
|
||||
self.fp.close()
|
||||
raise
|
||||
|
||||
def draft(self, mode, size):
|
||||
"""Set draft mode"""
|
||||
|
|
|
@ -219,7 +219,8 @@ def loadImageSeries(filelist=None):
|
|||
print("unable to find %s" % img)
|
||||
continue
|
||||
try:
|
||||
im = Image.open(img).convert2byte()
|
||||
with Image.open(img) as im:
|
||||
im = im.convert2byte()
|
||||
except Exception:
|
||||
if not isSpiderImage(img):
|
||||
print(img + " is not a Spider image file")
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
#
|
||||
|
||||
import io
|
||||
import sys
|
||||
|
||||
from . import ContainerIO
|
||||
|
||||
|
@ -64,10 +63,5 @@ class TarIO(ContainerIO.ContainerIO):
|
|||
def __exit__(self, *args):
|
||||
self.close()
|
||||
|
||||
if sys.version_info.major >= 3:
|
||||
|
||||
def __del__(self):
|
||||
self.close()
|
||||
|
||||
def close(self):
|
||||
self.fh.close()
|
||||
|
|
Loading…
Reference in New Issue
Block a user