Skip to content

Commit 2b84221

Browse files
committed
Fix ResourceWarning emitted during tests
Appeared in the form: ResourceWarning: unclosed file <_io.BufferedReader name='Tests/images/invalid-exif-without-x-resolution.jpg'> Enable all warnings to always display during tests to help catch these warnings earlier.
1 parent 22a6738 commit 2b84221

3 files changed

Lines changed: 22 additions & 22 deletions

File tree

Tests/test_file_jpeg.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -640,11 +640,11 @@ def test_invalid_exif(self):
640640

641641
def test_invalid_exif_x_resolution(self):
642642
# When no x or y resolution is defined in EXIF
643-
im = Image.open("Tests/images/invalid-exif-without-x-resolution.jpg")
643+
with Image.open("Tests/images/invalid-exif-without-x-resolution.jpg") as im:
644644

645-
# This should return the default, and not a ValueError or
646-
# OSError for an unidentified image.
647-
self.assertEqual(im.info.get("dpi"), (72, 72))
645+
# This should return the default, and not a ValueError or
646+
# OSError for an unidentified image.
647+
self.assertEqual(im.info.get("dpi"), (72, 72))
648648

649649
def test_ifd_offset_exif(self):
650650
# Arrange

Tests/test_file_tiff_metadata.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ def test_ifd_unsigned_rational(self):
231231
out = self.tempfile("temp.tiff")
232232
im.save(out, tiffinfo=info, compression="raw")
233233

234-
reloaded = Image.open(out)
235-
self.assertEqual(max_long, reloaded.tag_v2[41493].numerator)
236-
self.assertEqual(1, reloaded.tag_v2[41493].denominator)
234+
with Image.open(out) as reloaded:
235+
self.assertEqual(max_long, reloaded.tag_v2[41493].numerator)
236+
self.assertEqual(1, reloaded.tag_v2[41493].denominator)
237237

238238
# out of bounds of 4 byte unsigned long
239239
numerator = max_long + 1
@@ -243,9 +243,9 @@ def test_ifd_unsigned_rational(self):
243243
out = self.tempfile("temp.tiff")
244244
im.save(out, tiffinfo=info, compression="raw")
245245

246-
reloaded = Image.open(out)
247-
self.assertEqual(max_long, reloaded.tag_v2[41493].numerator)
248-
self.assertEqual(1, reloaded.tag_v2[41493].denominator)
246+
with Image.open(out) as reloaded:
247+
self.assertEqual(max_long, reloaded.tag_v2[41493].numerator)
248+
self.assertEqual(1, reloaded.tag_v2[41493].denominator)
249249

250250
def test_ifd_signed_rational(self):
251251
im = hopper()
@@ -260,9 +260,9 @@ def test_ifd_signed_rational(self):
260260
out = self.tempfile("temp.tiff")
261261
im.save(out, tiffinfo=info, compression="raw")
262262

263-
reloaded = Image.open(out)
264-
self.assertEqual(numerator, reloaded.tag_v2[37380].numerator)
265-
self.assertEqual(denominator, reloaded.tag_v2[37380].denominator)
263+
with Image.open(out) as reloaded:
264+
self.assertEqual(numerator, reloaded.tag_v2[37380].numerator)
265+
self.assertEqual(denominator, reloaded.tag_v2[37380].denominator)
266266

267267
numerator = -(2 ** 31)
268268
denominator = 2 ** 31 - 1
@@ -272,9 +272,9 @@ def test_ifd_signed_rational(self):
272272
out = self.tempfile("temp.tiff")
273273
im.save(out, tiffinfo=info, compression="raw")
274274

275-
reloaded = Image.open(out)
276-
self.assertEqual(numerator, reloaded.tag_v2[37380].numerator)
277-
self.assertEqual(denominator, reloaded.tag_v2[37380].denominator)
275+
with Image.open(out) as reloaded:
276+
self.assertEqual(numerator, reloaded.tag_v2[37380].numerator)
277+
self.assertEqual(denominator, reloaded.tag_v2[37380].denominator)
278278

279279
# out of bounds of 4 byte signed long
280280
numerator = -(2 ** 31) - 1
@@ -285,9 +285,9 @@ def test_ifd_signed_rational(self):
285285
out = self.tempfile("temp.tiff")
286286
im.save(out, tiffinfo=info, compression="raw")
287287

288-
reloaded = Image.open(out)
289-
self.assertEqual(2 ** 31 - 1, reloaded.tag_v2[37380].numerator)
290-
self.assertEqual(-1, reloaded.tag_v2[37380].denominator)
288+
with Image.open(out) as reloaded:
289+
self.assertEqual(2 ** 31 - 1, reloaded.tag_v2[37380].numerator)
290+
self.assertEqual(-1, reloaded.tag_v2[37380].denominator)
291291

292292
def test_ifd_signed_long(self):
293293
im = hopper()
@@ -298,8 +298,8 @@ def test_ifd_signed_long(self):
298298
out = self.tempfile("temp.tiff")
299299
im.save(out, tiffinfo=info, compression="raw")
300300

301-
reloaded = Image.open(out)
302-
self.assertEqual(reloaded.tag_v2[37000], -60000)
301+
with Image.open(out) as reloaded:
302+
self.assertEqual(reloaded.tag_v2[37000], -60000)
303303

304304
def test_empty_values(self):
305305
data = io.BytesIO(

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ commands =
1414
{envpython} setup.py clean
1515
{envpython} setup.py build_ext --inplace
1616
{envpython} selftest.py
17-
{envpython} -m pytest {posargs}
17+
{envpython} -W always -m pytest {posargs}
1818
deps =
1919
cffi
2020
numpy

0 commit comments

Comments
 (0)