.. testsetup:: *
- import warnings
- # Ignore warning when ByteString is imported
- with warnings.catch_warnings(action='ignore', category=DeprecationWarning):
- from collections.abc import *
+ from collections.abc import *
import itertools
__name__ = '<doctest>'
For use in typing, prefer a union, like ``bytes | bytearray``, or :class:`collections.abc.Buffer`.
(Contributed by Shantanu Jain in :gh:`91896`.)
-* :class:`typing.ByteString`, deprecated since Python 3.9, now causes an
- :exc:`DeprecationWarning` to be emitted when it is used or accessed.
+* :class:`typing.ByteString`, deprecated since Python 3.9, now causes a
+ :exc:`DeprecationWarning` to be emitted when it is used.
* Creating immutable types (:data:`Py_TPFLAGS_IMMUTABLETYPE`) with mutable
bases using the C API.
from _collections_abc import *
from _collections_abc import __all__
from _collections_abc import _CallableGenericAlias
-
-_deprecated_ByteString = globals().pop("ByteString")
-
-def __getattr__(attr):
- if attr == "ByteString":
- import warnings
- warnings._deprecated("collections.abc.ByteString", remove=(3, 14))
- return _deprecated_ByteString
- raise AttributeError(f"module 'collections.abc' has no attribute {attr!r}")
else:
zdc = zipimport._zip_directory_cache.copy()
abcs = {}
- # catch and ignore collections.abc.ByteString deprecation
- with warnings.catch_warnings(action='ignore', category=DeprecationWarning):
- for abc in [getattr(collections.abc, a) for a in collections.abc.__all__]:
- if not isabstract(abc):
- continue
- for obj in abc.__subclasses__() + [abc]:
- abcs[obj] = _get_dump(obj)[0]
+ for abc in [getattr(collections.abc, a) for a in collections.abc.__all__]:
+ if not isabstract(abc):
+ continue
+ for obj in abc.__subclasses__() + [abc]:
+ abcs[obj] = _get_dump(obj)[0]
# bpo-31217: Integer pool to get a single integer object for the same
# value. The pool is used to prevent false alarm when checking for memory
# Clear ABC registries, restoring previously saved ABC registries.
# ignore deprecation warning for collections.abc.ByteString
- with warnings.catch_warnings(action='ignore', category=DeprecationWarning):
- abs_classes = [getattr(collections.abc, a) for a in collections.abc.__all__]
+ abs_classes = [getattr(collections.abc, a) for a in collections.abc.__all__]
abs_classes = filter(isabstract, abs_classes)
for abc in abs_classes:
for obj in abc.__subclasses__() + [abc]:
import string
import sys
from test import support
-from test.support.import_helper import import_fresh_module
import types
import unittest
from collections.abc import Set, MutableSet
from collections.abc import Mapping, MutableMapping, KeysView, ItemsView, ValuesView
from collections.abc import Sequence, MutableSequence
-from collections.abc import Buffer
+from collections.abc import ByteString, Buffer
class TestUserObjects(unittest.TestCase):
nativeseq, seqseq, (letter, start, stop))
def test_ByteString(self):
- with self.assertWarns(DeprecationWarning):
- from collections.abc import ByteString
for sample in [bytes, bytearray]:
with self.assertWarns(DeprecationWarning):
self.assertIsInstance(sample(), ByteString)
# No metaclass conflict
class Z(ByteString, Awaitable): pass
- def test_ByteString_attribute_access(self):
- collections_abc = import_fresh_module("collections.abc")
- with self.assertWarns(DeprecationWarning):
- collections_abc.ByteString
-
def test_Buffer(self):
for sample in [bytes, bytearray, memoryview]:
self.assertIsInstance(sample(b"x"), Buffer)
import re
import sys
import warnings
-from test.support.import_helper import import_fresh_module
from unittest import TestCase, main, skipUnless, skip
from unittest.mock import patch
from copy import copy, deepcopy
self.assertEqual(MyChain[int]().__orig_class__, MyChain[int])
def test_all_repr_eq_any(self):
- typing = import_fresh_module("typing")
- with warnings.catch_warnings(record=True) as wlog:
- warnings.filterwarnings('always', '', DeprecationWarning)
- objs = [getattr(typing, el) for el in typing.__all__]
- self.assertEqual(
- [str(w.message) for w in wlog],
- ["'typing.ByteString' is deprecated and slated for removal in Python 3.14"]
- )
+ objs = (getattr(typing, el) for el in typing.__all__)
for obj in objs:
self.assertNotEqual(repr(obj), '')
self.assertEqual(obj, obj)
def test_bytestring(self):
with self.assertWarns(DeprecationWarning):
- from typing import ByteString
+ self.assertIsInstance(b'', typing.ByteString)
with self.assertWarns(DeprecationWarning):
- self.assertIsInstance(b'', ByteString)
+ self.assertIsInstance(bytearray(b''), typing.ByteString)
with self.assertWarns(DeprecationWarning):
- self.assertIsInstance(bytearray(b''), ByteString)
+ class Foo(typing.ByteString): ...
with self.assertWarns(DeprecationWarning):
- class Foo(ByteString): ...
- with self.assertWarns(DeprecationWarning):
- class Bar(ByteString, typing.Awaitable): ...
+ class Bar(typing.ByteString, typing.Awaitable): ...
def test_list(self):
self.assertIsSubclass(list, typing.List)
class SpecialAttrsTests(BaseTestCase):
def test_special_attrs(self):
- with warnings.catch_warnings(
- action='ignore', category=DeprecationWarning
- ):
- typing_ByteString = typing.ByteString
cls_to_check = {
# ABC classes
typing.AbstractSet: 'AbstractSet',
typing.AsyncIterable: 'AsyncIterable',
typing.AsyncIterator: 'AsyncIterator',
typing.Awaitable: 'Awaitable',
- typing_ByteString: 'ByteString',
+ typing.ByteString: 'ByteString',
typing.Callable: 'Callable',
typing.ChainMap: 'ChainMap',
typing.Collection: 'Collection',
getattr(v, '__module__', None) == typing.__name__
)
}
- # Deprecated; added dynamically via module __getattr__
- computed_all.add("ByteString")
self.assertSetEqual(computed_all, actual_all)
MutableMapping = _alias(collections.abc.MutableMapping, 2)
Sequence = _alias(collections.abc.Sequence, 1)
MutableSequence = _alias(collections.abc.MutableSequence, 1)
+ByteString = _DeprecatedGenericAlias(
+ collections.abc.ByteString, 0, removal_version=(3, 14) # Not generic.
+)
# Tuple accepts variable number of parameters.
Tuple = _TupleType(tuple, -1, inst=False, name='Tuple')
Tuple.__doc__ = \
# read-only property, TypeError if it's a builtin class.
pass
return method
-
-
-def __getattr__(attr):
- if attr == "ByteString":
- import warnings
- warnings._deprecated("typing.ByteString", remove=(3, 14))
- with warnings.catch_warnings(
- action="ignore", category=DeprecationWarning
- ):
- # Not generic
- ByteString = globals()["ByteString"] = _DeprecatedGenericAlias(
- collections.abc.ByteString, 0, removal_version=(3, 14)
- )
- return ByteString
- raise AttributeError(f"module 'typing' has no attribute {attr!r}")
-
-
-def _remove_cached_ByteString_from_globals():
- try:
- del globals()["ByteString"]
- except KeyError:
- pass
-
-_cleanups.append(_remove_cached_ByteString_from_globals)
projects / thirdparty / Python / cpython.git / commitdiff
