gh-91896: Deprecate collections.abc.ByteString (#102096)

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
This commit is contained in:
Shantanu 2023-05-04 09:39:33 -07:00 committed by GitHub
parent 2ba931ff72
commit 09b7695f12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 48 additions and 7 deletions

View File

@ -273,6 +273,12 @@ Collections Abstract Base Classes -- Detailed Descriptions
The index() method added support for *stop* and *start* The index() method added support for *stop* and *start*
arguments. arguments.
.. deprecated-removed:: 3.12 3.14
The :class:`ByteString` ABC has been deprecated.
For use in typing, prefer a union, like ``bytes | bytearray``, or
:class:`collections.abc.Buffer`.
For use as an ABC, prefer :class:`Sequence` or :class:`collections.abc.Buffer`.
.. class:: Set .. class:: Set
MutableSet MutableSet

View File

@ -2139,8 +2139,7 @@ Corresponding to collections in :mod:`collections.abc`
annotate arguments of any of the types mentioned above. annotate arguments of any of the types mentioned above.
.. deprecated:: 3.9 .. deprecated:: 3.9
:class:`collections.abc.ByteString` now supports subscripting (``[]``). Prefer :class:`collections.abc.Buffer`, or a union like ``bytes | bytearray | memoryview``.
See :pep:`585` and :ref:`types-genericalias`.
.. class:: Collection(Sized, Iterable[T_co], Container[T_co]) .. class:: Collection(Sized, Iterable[T_co], Container[T_co])

View File

@ -792,6 +792,11 @@ Pending Removal in Python 3.14
(Contributed by Jason R. Coombs and Hugo van Kemenade in :gh:`93963`.) (Contributed by Jason R. Coombs and Hugo van Kemenade in :gh:`93963`.)
* Deprecated :class:`collections.abc.ByteString`.
Prefer :class:`Sequence` or :class:`collections.abc.Buffer`.
For use in typing, prefer a union, like ``bytes | bytearray``, or :class:`collections.abc.Buffer`.
(Contributed by Shantanu Jain in :gh:`91896`.)
* Creating immutable types (:data:`Py_TPFLAGS_IMMUTABLETYPE`) with mutable * Creating immutable types (:data:`Py_TPFLAGS_IMMUTABLETYPE`) with mutable
bases using the C API. bases using the C API.

View File

@ -1071,8 +1071,27 @@ Sequence.register(str)
Sequence.register(range) Sequence.register(range)
Sequence.register(memoryview) Sequence.register(memoryview)
class _DeprecateByteStringMeta(ABCMeta):
def __new__(cls, name, bases, namespace, **kwargs):
if name != "ByteString":
import warnings
class ByteString(Sequence): warnings._deprecated(
"collections.abc.ByteString",
remove=(3, 14),
)
return super().__new__(cls, name, bases, namespace, **kwargs)
def __instancecheck__(cls, instance):
import warnings
warnings._deprecated(
"collections.abc.ByteString",
remove=(3, 14),
)
return super().__instancecheck__(instance)
class ByteString(Sequence, metaclass=_DeprecateByteStringMeta):
"""This unifies bytes and bytearray. """This unifies bytes and bytearray.
XXX Should add all their methods. XXX Should add all their methods.

View File

@ -1940,14 +1940,25 @@ class TestCollectionABCs(ABCTestCase):
def test_ByteString(self): def test_ByteString(self):
for sample in [bytes, bytearray]: for sample in [bytes, bytearray]:
self.assertIsInstance(sample(), ByteString) with self.assertWarns(DeprecationWarning):
self.assertIsInstance(sample(), ByteString)
self.assertTrue(issubclass(sample, ByteString)) self.assertTrue(issubclass(sample, ByteString))
for sample in [str, list, tuple]: for sample in [str, list, tuple]:
self.assertNotIsInstance(sample(), ByteString) with self.assertWarns(DeprecationWarning):
self.assertNotIsInstance(sample(), ByteString)
self.assertFalse(issubclass(sample, ByteString)) self.assertFalse(issubclass(sample, ByteString))
self.assertNotIsInstance(memoryview(b""), ByteString) with self.assertWarns(DeprecationWarning):
self.assertNotIsInstance(memoryview(b""), ByteString)
self.assertFalse(issubclass(memoryview, ByteString)) self.assertFalse(issubclass(memoryview, ByteString))
self.validate_abstract_methods(ByteString, '__getitem__', '__len__') with self.assertWarns(DeprecationWarning):
self.validate_abstract_methods(ByteString, '__getitem__', '__len__')
with self.assertWarns(DeprecationWarning):
class X(ByteString): pass
with self.assertWarns(DeprecationWarning):
# No metaclass conflict
class Z(ByteString, Awaitable): pass
def test_Buffer(self): def test_Buffer(self):
for sample in [bytes, bytearray, memoryview]: for sample in [bytes, bytearray, memoryview]:

View File

@ -0,0 +1 @@
Deprecate :class:`collections.abc.ByteString`