summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_dictviews.py36
-rw-r--r--Lib/test/test_functools.py39
-rw-r--r--Lib/test/test_hash.py2
-rw-r--r--Lib/test/test_pathlib.py6
-rw-r--r--Lib/test/test_statistics.py5
-rw-r--r--Lib/test/test_typing.py32
6 files changed, 61 insertions, 59 deletions
diff --git a/Lib/test/test_dictviews.py b/Lib/test/test_dictviews.py
index 49a9e9c..51ad9b3 100644
--- a/Lib/test/test_dictviews.py
+++ b/Lib/test/test_dictviews.py
@@ -1,4 +1,4 @@
-import collections
+import collections.abc
import copy
import pickle
import unittest
@@ -249,23 +249,23 @@ class DictSetTest(unittest.TestCase):
def test_abc_registry(self):
d = dict(a=1)
- self.assertIsInstance(d.keys(), collections.KeysView)
- self.assertIsInstance(d.keys(), collections.MappingView)
- self.assertIsInstance(d.keys(), collections.Set)
- self.assertIsInstance(d.keys(), collections.Sized)
- self.assertIsInstance(d.keys(), collections.Iterable)
- self.assertIsInstance(d.keys(), collections.Container)
-
- self.assertIsInstance(d.values(), collections.ValuesView)
- self.assertIsInstance(d.values(), collections.MappingView)
- self.assertIsInstance(d.values(), collections.Sized)
-
- self.assertIsInstance(d.items(), collections.ItemsView)
- self.assertIsInstance(d.items(), collections.MappingView)
- self.assertIsInstance(d.items(), collections.Set)
- self.assertIsInstance(d.items(), collections.Sized)
- self.assertIsInstance(d.items(), collections.Iterable)
- self.assertIsInstance(d.items(), collections.Container)
+ self.assertIsInstance(d.keys(), collections.abc.KeysView)
+ self.assertIsInstance(d.keys(), collections.abc.MappingView)
+ self.assertIsInstance(d.keys(), collections.abc.Set)
+ self.assertIsInstance(d.keys(), collections.abc.Sized)
+ self.assertIsInstance(d.keys(), collections.abc.Iterable)
+ self.assertIsInstance(d.keys(), collections.abc.Container)
+
+ self.assertIsInstance(d.values(), collections.abc.ValuesView)
+ self.assertIsInstance(d.values(), collections.abc.MappingView)
+ self.assertIsInstance(d.values(), collections.abc.Sized)
+
+ self.assertIsInstance(d.items(), collections.abc.ItemsView)
+ self.assertIsInstance(d.items(), collections.abc.MappingView)
+ self.assertIsInstance(d.items(), collections.abc.Set)
+ self.assertIsInstance(d.items(), collections.abc.Sized)
+ self.assertIsInstance(d.items(), collections.abc.Iterable)
+ self.assertIsInstance(d.items(), collections.abc.Container)
if __name__ == "__main__":
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index 29ea493..8eede7a 100644
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -1,6 +1,7 @@
import abc
import builtins
import collections
+import collections.abc
import copy
from itertools import permutations
import pickle
@@ -910,7 +911,7 @@ class TestCmpToKey:
key = self.cmp_to_key(mycmp)
k = key(10)
self.assertRaises(TypeError, hash, k)
- self.assertNotIsInstance(k, collections.Hashable)
+ self.assertNotIsInstance(k, collections.abc.Hashable)
@unittest.skipUnless(c_functools, 'requires the C _functools module')
@@ -1707,7 +1708,7 @@ class TestSingleDispatch(unittest.TestCase):
def test_compose_mro(self):
# None of the examples in this test depend on haystack ordering.
- c = collections
+ c = collections.abc
mro = functools._compose_mro
bases = [c.Sequence, c.MutableMapping, c.Mapping, c.Set]
for haystack in permutations(bases):
@@ -1715,10 +1716,10 @@ class TestSingleDispatch(unittest.TestCase):
self.assertEqual(m, [dict, c.MutableMapping, c.Mapping,
c.Collection, c.Sized, c.Iterable,
c.Container, object])
- bases = [c.Container, c.Mapping, c.MutableMapping, c.OrderedDict]
+ bases = [c.Container, c.Mapping, c.MutableMapping, collections.OrderedDict]
for haystack in permutations(bases):
- m = mro(c.ChainMap, haystack)
- self.assertEqual(m, [c.ChainMap, c.MutableMapping, c.Mapping,
+ m = mro(collections.ChainMap, haystack)
+ self.assertEqual(m, [collections.ChainMap, c.MutableMapping, c.Mapping,
c.Collection, c.Sized, c.Iterable,
c.Container, object])
@@ -1728,39 +1729,39 @@ class TestSingleDispatch(unittest.TestCase):
# test_mro_conflicts).
bases = [c.Container, c.Sized, str]
for haystack in permutations(bases):
- m = mro(c.defaultdict, [c.Sized, c.Container, str])
- self.assertEqual(m, [c.defaultdict, dict, c.Sized, c.Container,
- object])
+ m = mro(collections.defaultdict, [c.Sized, c.Container, str])
+ self.assertEqual(m, [collections.defaultdict, dict, c.Sized,
+ c.Container, object])
# MutableSequence below is registered directly on D. In other words, it
# precedes MutableMapping which means single dispatch will always
# choose MutableSequence here.
- class D(c.defaultdict):
+ class D(collections.defaultdict):
pass
c.MutableSequence.register(D)
bases = [c.MutableSequence, c.MutableMapping]
for haystack in permutations(bases):
m = mro(D, bases)
self.assertEqual(m, [D, c.MutableSequence, c.Sequence, c.Reversible,
- c.defaultdict, dict, c.MutableMapping, c.Mapping,
+ collections.defaultdict, dict, c.MutableMapping, c.Mapping,
c.Collection, c.Sized, c.Iterable, c.Container,
object])
# Container and Callable are registered on different base classes and
# a generic function supporting both should always pick the Callable
# implementation if a C instance is passed.
- class C(c.defaultdict):
+ class C(collections.defaultdict):
def __call__(self):
pass
bases = [c.Sized, c.Callable, c.Container, c.Mapping]
for haystack in permutations(bases):
m = mro(C, haystack)
- self.assertEqual(m, [C, c.Callable, c.defaultdict, dict, c.Mapping,
+ self.assertEqual(m, [C, c.Callable, collections.defaultdict, dict, c.Mapping,
c.Collection, c.Sized, c.Iterable,
c.Container, object])
def test_register_abc(self):
- c = collections
+ c = collections.abc
d = {"a": "b"}
l = [1, 2, 3]
s = {object(), None}
@@ -1786,7 +1787,7 @@ class TestSingleDispatch(unittest.TestCase):
self.assertEqual(g(s), "sized")
self.assertEqual(g(f), "sized")
self.assertEqual(g(t), "sized")
- g.register(c.ChainMap, lambda obj: "chainmap")
+ g.register(collections.ChainMap, lambda obj: "chainmap")
self.assertEqual(g(d), "mutablemapping") # irrelevant ABCs registered
self.assertEqual(g(l), "sized")
self.assertEqual(g(s), "sized")
@@ -1854,7 +1855,7 @@ class TestSingleDispatch(unittest.TestCase):
self.assertEqual(g(t), "tuple")
def test_c3_abc(self):
- c = collections
+ c = collections.abc
mro = functools._c3_mro
class A(object):
pass
@@ -1895,7 +1896,7 @@ class TestSingleDispatch(unittest.TestCase):
self.assertEqual(fun(aa), 'fun A')
def test_mro_conflicts(self):
- c = collections
+ c = collections.abc
@functools.singledispatch
def g(arg):
return "base"
@@ -1956,7 +1957,7 @@ class TestSingleDispatch(unittest.TestCase):
# MutableMapping's bases implicit as well from defaultdict's
# perspective.
with self.assertRaises(RuntimeError) as re_two:
- h(c.defaultdict(lambda: 0))
+ h(collections.defaultdict(lambda: 0))
self.assertIn(
str(re_two.exception),
(("Ambiguous dispatch: <class 'collections.abc.Container'> "
@@ -1964,7 +1965,7 @@ class TestSingleDispatch(unittest.TestCase):
("Ambiguous dispatch: <class 'collections.abc.Sized'> "
"or <class 'collections.abc.Container'>")),
)
- class R(c.defaultdict):
+ class R(collections.defaultdict):
pass
c.MutableSequence.register(R)
@functools.singledispatch
@@ -2041,7 +2042,7 @@ class TestSingleDispatch(unittest.TestCase):
_orig_wkd = functools.WeakKeyDictionary
td = TracingDict()
functools.WeakKeyDictionary = lambda: td
- c = collections
+ c = collections.abc
@functools.singledispatch
def g(arg):
return "base"
diff --git a/Lib/test/test_hash.py b/Lib/test/test_hash.py
index aa4efbf..01dd777 100644
--- a/Lib/test/test_hash.py
+++ b/Lib/test/test_hash.py
@@ -8,7 +8,7 @@ import os
import sys
import unittest
from test.support.script_helper import assert_python_ok
-from collections import Hashable
+from collections.abc import Hashable
IS_64BIT = sys.maxsize > 2**32
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index 21a6390..138bc06 100644
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -1,4 +1,4 @@
-import collections
+import collections.abc
import io
import os
import errno
@@ -1408,7 +1408,7 @@ class _BasePathTest(object):
P = self.cls
p = P(BASE)
it = p.glob("fileA")
- self.assertIsInstance(it, collections.Iterator)
+ self.assertIsInstance(it, collections.abc.Iterator)
_check(it, ["fileA"])
_check(p.glob("fileB"), [])
_check(p.glob("dir*/file*"), ["dirB/fileB", "dirC/fileC"])
@@ -1432,7 +1432,7 @@ class _BasePathTest(object):
P = self.cls
p = P(BASE)
it = p.rglob("fileA")
- self.assertIsInstance(it, collections.Iterator)
+ self.assertIsInstance(it, collections.abc.Iterator)
_check(it, ["fileA"])
_check(p.rglob("fileB"), ["dirB/fileB"])
_check(p.rglob("*/fileA"), [])
diff --git a/Lib/test/test_statistics.py b/Lib/test/test_statistics.py
index 4b3fd36..b577433 100644
--- a/Lib/test/test_statistics.py
+++ b/Lib/test/test_statistics.py
@@ -4,6 +4,7 @@ approx_equal function.
"""
import collections
+import collections.abc
import decimal
import doctest
import math
@@ -218,8 +219,8 @@ class NumericTestCase(unittest.TestCase):
if rel is None:
rel = self.rel
if (
- isinstance(first, collections.Sequence) and
- isinstance(second, collections.Sequence)
+ isinstance(first, collections.abc.Sequence) and
+ isinstance(second, collections.abc.Sequence)
):
check = self._check_approx_seq
else:
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index f0070ec..20fc221 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -2023,11 +2023,11 @@ class CollectionsAbcTests(BaseTestCase):
self.assertIsSubclass(MMC, typing.Mapping)
self.assertIsInstance(MMB[KT, VT](), typing.Mapping)
- self.assertIsInstance(MMB[KT, VT](), collections.Mapping)
+ self.assertIsInstance(MMB[KT, VT](), collections_abc.Mapping)
- self.assertIsSubclass(MMA, collections.Mapping)
- self.assertIsSubclass(MMB, collections.Mapping)
- self.assertIsSubclass(MMC, collections.Mapping)
+ self.assertIsSubclass(MMA, collections_abc.Mapping)
+ self.assertIsSubclass(MMB, collections_abc.Mapping)
+ self.assertIsSubclass(MMC, collections_abc.Mapping)
self.assertIsSubclass(MMB[str, str], typing.Mapping)
self.assertIsSubclass(MMC, MMA)
@@ -2039,9 +2039,9 @@ class CollectionsAbcTests(BaseTestCase):
def g(): yield 0
self.assertIsSubclass(G, typing.Generator)
self.assertIsSubclass(G, typing.Iterable)
- if hasattr(collections, 'Generator'):
- self.assertIsSubclass(G, collections.Generator)
- self.assertIsSubclass(G, collections.Iterable)
+ if hasattr(collections_abc, 'Generator'):
+ self.assertIsSubclass(G, collections_abc.Generator)
+ self.assertIsSubclass(G, collections_abc.Iterable)
self.assertNotIsSubclass(type(g), G)
@skipUnless(PY36, 'Python 3.6 required')
@@ -2057,15 +2057,15 @@ class CollectionsAbcTests(BaseTestCase):
g = ns['g']
self.assertIsSubclass(G, typing.AsyncGenerator)
self.assertIsSubclass(G, typing.AsyncIterable)
- self.assertIsSubclass(G, collections.AsyncGenerator)
- self.assertIsSubclass(G, collections.AsyncIterable)
+ self.assertIsSubclass(G, collections_abc.AsyncGenerator)
+ self.assertIsSubclass(G, collections_abc.AsyncIterable)
self.assertNotIsSubclass(type(g), G)
instance = G()
self.assertIsInstance(instance, typing.AsyncGenerator)
self.assertIsInstance(instance, typing.AsyncIterable)
- self.assertIsInstance(instance, collections.AsyncGenerator)
- self.assertIsInstance(instance, collections.AsyncIterable)
+ self.assertIsInstance(instance, collections_abc.AsyncGenerator)
+ self.assertIsInstance(instance, collections_abc.AsyncIterable)
self.assertNotIsInstance(type(g), G)
self.assertNotIsInstance(g, G)
@@ -2102,23 +2102,23 @@ class CollectionsAbcTests(BaseTestCase):
self.assertIsSubclass(D, B)
class M(): ...
- collections.MutableMapping.register(M)
+ collections_abc.MutableMapping.register(M)
self.assertIsSubclass(M, typing.Mapping)
def test_collections_as_base(self):
- class M(collections.Mapping): ...
+ class M(collections_abc.Mapping): ...
self.assertIsSubclass(M, typing.Mapping)
self.assertIsSubclass(M, typing.Iterable)
- class S(collections.MutableSequence): ...
+ class S(collections_abc.MutableSequence): ...
self.assertIsSubclass(S, typing.MutableSequence)
self.assertIsSubclass(S, typing.Iterable)
- class I(collections.Iterable): ...
+ class I(collections_abc.Iterable): ...
self.assertIsSubclass(I, typing.Iterable)
- class A(collections.Mapping, metaclass=abc.ABCMeta): ...
+ class A(collections_abc.Mapping, metaclass=abc.ABCMeta): ...
class B: ...
A.register(B)
self.assertIsSubclass(B, typing.Mapping)
generated by cgit v0.12 at 2025-04-25 17:30:49 (GMT)