Merge pull request #4536 from hugovk/oserror

Replace IOError and WindowsError aliases with OSError

Author: radarhere

Tests/check_j2k_overflow.py

@@ -5,5 +5,5 @@
 def test_j2k_overflow(tmp_path):
     im = Image.new("RGBA", (1024, 131584))
     target = str(tmp_path / "temp.jpc")
-    with pytest.raises(IOError):
+    with pytest.raises(OSError):
         im.save(target)

Tests/check_libtiff_segfault.py

@@ -9,6 +9,6 @@ def test_libtiff_segfault():
         libtiff >= 4.0.0
         """
 
-    with pytest.raises(IOError):
+    with pytest.raises(OSError):
         with Image.open(TEST_FILE) as im:
             im.load()

Tests/test_file_bufrstub.py

@@ -32,7 +32,7 @@ def test_load():
     with Image.open(TEST_FILE) as im:
 
         # Act / Assert: stub cannot load without an implemented handler
-        with pytest.raises(IOError):
+        with pytest.raises(OSError):
             im.load()
 
 
@@ -42,5 +42,5 @@ def test_save(tmp_path):
     tmpfile = str(tmp_path / "temp.bufr")
 
     # Act / Assert: stub cannot save without an implemented handler
-    with pytest.raises(IOError):
+    with pytest.raises(OSError):
         im.save(tmpfile)

Tests/test_file_dds.py

@@ -138,7 +138,7 @@ def test_short_header():
     def short_header():
         Image.open(BytesIO(img_file[:119]))
 
-    with pytest.raises(IOError):
+    with pytest.raises(OSError):
         short_header()
 
 
@@ -152,7 +152,7 @@ def short_file():
         with Image.open(BytesIO(img_file[:-100])) as im:
             im.load()
 
-    with pytest.raises(IOError):
+    with pytest.raises(OSError):
         short_file()
 
 

Tests/test_file_fitsstub.py

@@ -30,7 +30,7 @@ def test_load():
     with Image.open(TEST_FILE) as im:
 
         # Act / Assert: stub cannot load without an implemented handler
-        with pytest.raises(IOError):
+        with pytest.raises(OSError):
             im.load()
 
 
@@ -41,7 +41,7 @@ def test_save():
         dummy_filename = "dummy.filename"
 
         # Act / Assert: stub cannot save without an implemented handler
-        with pytest.raises(IOError):
+        with pytest.raises(OSError):
             im.save(dummy_filename)
-        with pytest.raises(IOError):
+        with pytest.raises(OSError):
             FitsStubImagePlugin._save(im, dummy_fp, dummy_filename)

Tests/test_file_fpx.py

@@ -19,5 +19,5 @@ def test_invalid_file():
 
 
 def test_fpx_invalid_number_of_bands():
-    with pytest.raises(IOError, match="Invalid number of bands"):
+    with pytest.raises(OSError, match="Invalid number of bands"):
         Image.open("Tests/images/input_bw_five_bands.fpx")

Tests/test_file_gribstub.py

@@ -32,7 +32,7 @@ def test_load():
     with Image.open(TEST_FILE) as im:
 
         # Act / Assert: stub cannot load without an implemented handler
-        with pytest.raises(IOError):
+        with pytest.raises(OSError):
             im.load()
 
 
@@ -42,5 +42,5 @@ def test_save(tmp_path):
     tmpfile = str(tmp_path / "temp.grib")
 
     # Act / Assert: stub cannot save without an implemented handler
-    with pytest.raises(IOError):
+    with pytest.raises(OSError):
         im.save(tmpfile)

Tests/test_file_hdf5stub.py

@@ -30,7 +30,7 @@ def test_load():
     with Image.open(TEST_FILE) as im:
 
         # Act / Assert: stub cannot load without an implemented handler
-        with pytest.raises(IOError):
+        with pytest.raises(OSError):
             im.load()
 
 
@@ -41,7 +41,7 @@ def test_save():
         dummy_filename = "dummy.filename"
 
         # Act / Assert: stub cannot save without an implemented handler
-        with pytest.raises(IOError):
+        with pytest.raises(OSError):
             im.save(dummy_filename)
-        with pytest.raises(IOError):
+        with pytest.raises(OSError):
             Hdf5StubImagePlugin._save(im, dummy_fp, dummy_filename)

Tests/test_file_jpeg.py

@@ -147,7 +147,7 @@ def test_large_icc_meta(self, tmp_path):
         with Image.open("Tests/images/icc_profile_big.jpg") as im:
             f = str(tmp_path / "temp.jpg")
             icc_profile = im.info["icc_profile"]
-            # Should not raise IOError for image with icc larger than image size.
+            # Should not raise OSError for image with icc larger than image size.
             im.save(
                 f,
                 format="JPEG",
@@ -379,14 +379,14 @@ def test_truncated_jpeg_should_read_all_the_data(self):
             ImageFile.LOAD_TRUNCATED_IMAGES = False
             assert im.getbbox() is not None
 
-    def test_truncated_jpeg_throws_IOError(self):
+    def test_truncated_jpeg_throws_oserror(self):
         filename = "Tests/images/truncated_jpeg.jpg"
         with Image.open(filename) as im:
-            with pytest.raises(IOError):
+            with pytest.raises(OSError):
                 im.load()
 
             # Test that the error is raised if loaded a second time
-            with pytest.raises(IOError):
+            with pytest.raises(OSError):
                 im.load()
 
     def test_qtables(self, tmp_path):
@@ -552,7 +552,7 @@ def test_save_wrong_modes(self):
         out = BytesIO()
         for mode in ["LA", "La", "RGBA", "RGBa", "P"]:
             img = Image.new(mode, (20, 20))
-            with pytest.raises(IOError):
+            with pytest.raises(OSError):
                 img.save(out, "JPEG")
 
     def test_save_tiff_with_dpi(self, tmp_path):
@@ -702,7 +702,7 @@ def test_fd_leak(self, tmp_path):
         im = Image.open(tmpfile)
         fp = im.fp
         assert not fp.closed
-        with pytest.raises(WindowsError):
+        with pytest.raises(OSError):
             os.remove(tmpfile)
         im.load()
         assert fp.closed

Tests/test_file_jpeg2k.py

@@ -218,7 +218,7 @@ def test_16bit_jp2_roundtrips():
 
 def test_unbound_local():
     # prepatch, a malformed jp2 file could cause an UnboundLocalError exception.
-    with pytest.raises(IOError):
+    with pytest.raises(OSError):
         Image.open("Tests/images/unbound_variable.jp2")