Skip to content

Commit

Permalink
Moved Buffer into _typing
Browse files Browse the repository at this point in the history
  • Loading branch information
radarhere committed Sep 7, 2024
1 parent 1105256 commit 2e6bc54
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 21 deletions.
16 changes: 4 additions & 12 deletions src/PIL/GifImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@

if TYPE_CHECKING:
from . import _imaging
from ._typing import Buffer


class LoadingStrategy(IntEnum):
Expand Down Expand Up @@ -1157,18 +1158,9 @@ def getdata(
class Collector(BytesIO):
data = []

if sys.version_info >= (3, 12):
from collections.abc import Buffer

def write(self, data: Buffer) -> int:
self.data.append(data)
return len(data)

else:

def write(self, data: Any) -> int:
self.data.append(data)
return len(data)
def write(self, data: Buffer) -> int:
self.data.append(data)
return len(data)

im.load() # make sure raster data is available

Expand Down
10 changes: 1 addition & 9 deletions src/PIL/TiffImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
from .TiffTags import TYPES

if TYPE_CHECKING:
from ._typing import IntegralLike
from ._typing import Buffer, IntegralLike

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -2108,17 +2108,9 @@ def skipIFDs(self) -> None:
num_tags = self.readShort()
self.f.seek(num_tags * 12, os.SEEK_CUR)

if sys.version_info >= (3, 12):
from collections.abc import Buffer

def write(self, data: Buffer, /) -> int:
return self.f.write(data)

else:

def write(self, data: Any, /) -> int:
return self.f.write(data)

def readShort(self) -> int:
(value,) = struct.unpack(self.shortFmt, self.f.read(2))
return value
Expand Down
5 changes: 5 additions & 0 deletions src/PIL/_typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
except (ImportError, AttributeError):
pass

if sys.version_info >= (3, 12):
from collections.abc import Buffer
else:
Buffer = Any

if sys.version_info >= (3, 10):
from typing import TypeGuard
else:
Expand Down

0 comments on commit 2e6bc54

Please sign in to comment.