fix ambiguous raise matches

Author: braingram

asdf/_tests/_block/test_io.py

@@ -169,7 +169,7 @@ def test_write_oversized_block():
     data = np.ones(30, dtype="uint8")
     raw_fd = io.BytesIO()
     fd = generic_io.get_file(raw_fd, mode="rw")
-    with pytest.raises(RuntimeError, match="Block used size.*"):
+    with pytest.raises(RuntimeError, match=r"Block used size.*"):
         bio.write_block(fd, data, allocated_size=0)
     assert fd.tell() == 0
 
@@ -190,7 +190,7 @@ def test_fd_not_seekable():
 
     np.testing.assert_array_equal(d, data)
 
-    with pytest.raises(ValueError, match="write_block received offset.*"):
+    with pytest.raises(ValueError, match=r"write_block received offset.*"):
         bio.write_block(fd, data, offset=0)
 
 
@@ -223,14 +223,14 @@ def test_read_from_closed(tmp_path):
         bio.write_block(fd, data, stream=True)
     with generic_io.get_file(fn, mode="rw") as fd:
         _, _, _, callback = bio.read_block(fd, offset=0, lazy_load=True)
-    with pytest.raises(OSError, match="ASDF file has already been closed. Can not get the data."):
+    with pytest.raises(OSError, match=r"ASDF file has already been closed\. Can not get the data\."):
         callback()
 
 
 @pytest.mark.parametrize("data", [np.ones(10, dtype="f4"), np.ones((3, 3), dtype="uint8")])
 def test_invalid_data(data):
     fd = generic_io.get_file(io.BytesIO(), mode="rw")
-    with pytest.raises(ValueError, match="Data must be of.*"):
+    with pytest.raises(ValueError, match=r"Data must be of.*"):
         bio.write_block(fd, data, stream=True)
 
 
@@ -337,7 +337,7 @@ def test_read_block_index_no_header(tmp_path):
     generate_block_index_file(fn, values=values, offset=0)
     with generic_io.get_file(fn, "r") as fd:
         fd.seek(len(constants.INDEX_HEADER))
-        with pytest.raises(BlockIndexError, match="Failed to read block index.*"):
+        with pytest.raises(BlockIndexError, match=r"Failed to read block index.*"):
             assert bio.read_block_index(fd) == values
 
 

asdf/_tests/_block/test_options.py

@@ -68,27 +68,27 @@ def test_default_compression():
 
 @pytest.mark.parametrize("invalid_storage", invalid_storage_types)
 def test_invalid_storage_type_init(invalid_storage):
-    with pytest.raises(ValueError, match="array_storage must be one of.*"):
+    with pytest.raises(ValueError, match=r"array_storage must be one of.*"):
         Options(invalid_storage)
 
 
 @pytest.mark.parametrize("invalid_storage", invalid_storage_types)
 def test_invalid_storage_attr(invalid_storage):
     o = Options("internal")
-    with pytest.raises(ValueError, match="array_storage must be one of.*"):
+    with pytest.raises(ValueError, match=r"array_storage must be one of.*"):
         o.storage_type = invalid_storage
 
 
 @pytest.mark.parametrize("invalid_compression", invalid_compression_types)
 def test_invalid_compression_attr(invalid_compression):
     o = Options("internal")
-    with pytest.raises(ValueError, match="Invalid compression.*"):
+    with pytest.raises(ValueError, match=r"Invalid compression.*"):
         o.compression = invalid_compression
 
 
 @pytest.mark.parametrize("invalid_compression", invalid_compression_types)
 def test_invalid_compression_init(invalid_compression):
-    with pytest.raises(ValueError, match="Invalid compression.*"):
+    with pytest.raises(ValueError, match=r"Invalid compression.*"):
         Options("internal", invalid_compression)
 
 

asdf/_tests/_block/test_reader.py

@@ -140,7 +140,7 @@ def test_invalid_block_index(tmp_path, invalid_block_index):
             with pytest.warns(AsdfBlockIndexWarning, match="Failed to read block index"):
                 check(read_blocks(fd, lazy_load=True))
         else:
-            with pytest.raises(ValueError, match="Header size.*"):
+            with pytest.raises(ValueError, match=r"Header size.*"):
                 check(read_blocks(fd, lazy_load=True))
 
 
@@ -190,7 +190,7 @@ def test_bad_checksum(validate_checksums):
 
     with generic_io.get_file(buff, mode="r") as fd:
         if validate_checksums:
-            with pytest.raises(ValueError, match=".* does not match given checksum"):
+            with pytest.raises(ValueError, match=r".* does not match given checksum"):
                 read_blocks(fd, lazy_load=False, validate_checksums=validate_checksums)[0].data
         else:
             read_blocks(fd, lazy_load=False, validate_checksums=validate_checksums)[0].data

asdf/_tests/_regtests/test_1539.py

@@ -17,6 +17,6 @@ def test_invalid_seek_and_read_from_closed_memoryio():
     b.seek(0)
     f = asdf.generic_io.get_file(b)
     f.close()
-    with pytest.raises(IOError, match="I/O operation on closed file."):
+    with pytest.raises(IOError, match=r"I/O operation on closed file\."):
         f.read_into_array(10)
     assert b.tell() == 0

asdf/_tests/test_extension.py

@@ -1037,7 +1037,7 @@ class MailboxExtension:
         assert "mailbox" not in sys.modules
 
         # as the module hasn't been loaded, the converter shouldn't be found
-        with pytest.raises(KeyError, match="No support available for Python type 'mailbox.Mailbox'"):
+        with pytest.raises(KeyError, match=r"No support available for Python type 'mailbox\.Mailbox'"):
             extension_manager.get_converter_for_type(typ)
 
         # make sure inspecting the type didn't import the module

pyproject.toml

@@ -188,7 +188,6 @@ extend-ignore = [
     "S310", # URL open for permitted schemes
     "RUF005",  # prefer concatenate over add for collections
     "RUF012",  # mutable-class-default (typing related)
-    "RUF043",  # ambiguous raise
 ]
 
 [tool.ruff.lint.per-file-ignores]