Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Tests/test_imagepalette.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,9 @@ def test_rawmode_getdata() -> None:

# Assert
assert rawmode == "RGB"
assert data_in == data_out
assert data_out == bytes(data_in)
im = Image.new("P", (1, 1))
im.im.putpalette("RGB", rawmode, data_out)


def test_2bit_palette(tmp_path: Path) -> None:
Expand Down
15 changes: 9 additions & 6 deletions src/PIL/ImagePalette.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,21 @@ def copy(self) -> ImagePalette:

return new

def getdata(self) -> tuple[str, Sequence[int] | bytes | bytearray]:
def _tobytes(self) -> bytes:
if isinstance(self.palette, bytes):
return self.palette
arr = array.array("B", self.palette)
return arr.tobytes()

def getdata(self) -> tuple[str, bytes]:
"""
Get palette contents in format suitable for the low-level
``im.putpalette`` primitive.

.. warning:: This method is experimental.
"""
if self.rawmode:
return self.rawmode, self.palette
return self.rawmode, self._tobytes()
return self.mode, self.tobytes()

def tobytes(self) -> bytes:
Expand All @@ -116,10 +122,7 @@ def tobytes(self) -> bytes:
if self.rawmode:
msg = "palette contains raw palette data"
raise ValueError(msg)
if isinstance(self.palette, bytes):
return self.palette
arr = array.array("B", self.palette)
return arr.tobytes()
return self._tobytes()

# Declare tostring as an alias for tobytes
tostring = tobytes
Expand Down