python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-24 17:06:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6644 from radarhere/convert

Browse Source
This commit is contained in:
Hugo van Kemenade 2022-10-19 10:22:00 +02:00 committed by GitHub
commit 87a9d7197e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/test_image_convert.py
View File

@ -38,6 +38,12 @@ def test_sanity():
convert(im, output_mode) convert(im, output_mode)
def test_unsupported_conversion():
im = hopper()
with pytest.raises(ValueError):
im.convert("INVALID")
def test_default(): def test_default():
im = hopper("P") im = hopper("P")

5
src/PIL/Image.py
View File

@ -1051,7 +1051,10 @@ class Image:
except ValueError: except ValueError:
try: try:
# normalize source image and try again # normalize source image and try again
im = self.im.convert(getmodebase(self.mode)) modebase = getmodebase(self.mode)
if modebase == self.mode:
raise
im = self.im.convert(modebase)
im = im.convert(mode, dither) im = im.convert(mode, dither)
except KeyError as e: except KeyError as e:
raise ValueError("illegal conversion") from e raise ValueError("illegal conversion") from e