diff --git a/src/__init__.py b/src/__init__.py index 8b756ccfe..2bff8ec07 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -462,12 +462,7 @@ def _format_g(value, *, fmt='%g'): format_g = _format_g -# ByteString is gone from typing in 3.14. -# collections.abc.Buffer available from 3.12 only -try: - ByteString = typing.ByteString -except AttributeError: - ByteString = bytes | bytearray | memoryview +ByteString = bytes | bytearray | memoryview # Names required by class method typing annotations. OptBytes = typing.Optional[ByteString] diff --git a/src/utils.py b/src/utils.py index 7d3271ea8..e42a1c0b1 100644 --- a/src/utils.py +++ b/src/utils.py @@ -24,13 +24,8 @@ matrix_like = "matrix_like" quad_like = "quad_like" -# ByteString is gone from typing in 3.14. -# collections.abc.Buffer available from 3.12 only -try: - ByteString = typing.ByteString -except AttributeError: - # pylint: disable=unsupported-binary-operation - ByteString = bytes | bytearray | memoryview +# pylint: disable=unsupported-binary-operation +ByteString = bytes | bytearray | memoryview AnyType = typing.Any OptInt = typing.Union[int, None] diff --git a/src_classic/fitz_old.i b/src_classic/fitz_old.i index 8abc89558..3e94b3bce 100644 --- a/src_classic/fitz_old.i +++ b/src_classic/fitz_old.i @@ -322,12 +322,7 @@ rect_like = "rect_like" matrix_like = "matrix_like" quad_like = "quad_like" -# ByteString is gone from typing in 3.14. -# collections.abc.Buffer available from 3.12 only -try: - ByteString = typing.ByteString -except AttributeError: - ByteString = bytes | bytearray | memoryview +ByteString = bytes | bytearray | memoryview AnyType = typing.Any OptInt = typing.Union[int, None] diff --git a/src_classic/utils.py b/src_classic/utils.py index c1369afbc..3639834c0 100644 --- a/src_classic/utils.py +++ b/src_classic/utils.py @@ -24,12 +24,7 @@ matrix_like = "matrix_like" quad_like = "quad_like" -# ByteString is gone from typing in 3.14. -# collections.abc.Buffer available from 3.12 only -try: - ByteString = typing.ByteString -except AttributeError: - ByteString = bytes | bytearray | memoryview +ByteString = bytes | bytearray | memoryview AnyType = typing.Any OptInt = typing.Union[int, None]