From d4f9c6e08270aedfc446e38a0dd611ca7ad17016 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 3 Apr 2021 21:51:23 +1100 Subject: [PATCH] Renamed register_open accept methods for consistency --- Tests/test_file_dds.py | 8 ++++---- src/PIL/DdsImagePlugin.py | 4 ++-- src/PIL/FtexImagePlugin.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Tests/test_file_dds.py b/Tests/test_file_dds.py index 682cd048b..17c56bb77 100644 --- a/Tests/test_file_dds.py +++ b/Tests/test_file_dds.py @@ -136,25 +136,25 @@ def test_uncompressed_rgb(): ) -def test__validate_true(): +def test__accept_true(): """Check valid prefix""" # Arrange prefix = b"DDS etc" # Act - output = DdsImagePlugin._validate(prefix) + output = DdsImagePlugin._accept(prefix) # Assert assert output -def test__validate_false(): +def test__accept_false(): """Check invalid prefix""" # Arrange prefix = b"something invalid" # Act - output = DdsImagePlugin._validate(prefix) + output = DdsImagePlugin._accept(prefix) # Assert assert not output diff --git a/src/PIL/DdsImagePlugin.py b/src/PIL/DdsImagePlugin.py index df2d0060c..f405b84e3 100644 --- a/src/PIL/DdsImagePlugin.py +++ b/src/PIL/DdsImagePlugin.py @@ -182,9 +182,9 @@ class DdsImageFile(ImageFile.ImageFile): pass -def _validate(prefix): +def _accept(prefix): return prefix[:4] == b"DDS " -Image.register_open(DdsImageFile.format, DdsImageFile, _validate) +Image.register_open(DdsImageFile.format, DdsImageFile, _accept) Image.register_extension(DdsImageFile.format, ".dds") diff --git a/src/PIL/FtexImagePlugin.py b/src/PIL/FtexImagePlugin.py index 900661238..3b169038c 100644 --- a/src/PIL/FtexImagePlugin.py +++ b/src/PIL/FtexImagePlugin.py @@ -98,9 +98,9 @@ class FtexImageFile(ImageFile.ImageFile): pass -def _validate(prefix): +def _accept(prefix): return prefix[:4] == MAGIC -Image.register_open(FtexImageFile.format, FtexImageFile, _validate) +Image.register_open(FtexImageFile.format, FtexImageFile, _accept) Image.register_extensions(FtexImageFile.format, [".ftc", ".ftu"])