diff options
author | Steve Dower <steve.dower@python.org> | 2020-10-19 15:50:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-19 15:50:36 +0100 |
commit | c82f10450c547eb94a04ee17b7c816ff31948297 (patch) | |
tree | ad305c05c5745e1a5e7c136545bec7eefa741e32 /Lib/test/test_genericalias.py | |
parent | eee6bb50c69d94280f43b47390ea9d1b5f42930c (diff) | |
parent | b580ed1d9d55461d8dde027411b90be26cae131e (diff) | |
download | cpython-git-bpo-39107.tar.gz |
Merge branch 'master' into bpo-39107bpo-39107
Diffstat (limited to 'Lib/test/test_genericalias.py')
-rw-r--r-- | Lib/test/test_genericalias.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_genericalias.py b/Lib/test/test_genericalias.py index 643fffc073..2979cfb550 100644 --- a/Lib/test/test_genericalias.py +++ b/Lib/test/test_genericalias.py @@ -29,7 +29,7 @@ try: except ImportError: # multiprocessing.shared_memory is not available on e.g. Android ShareableList = None -from multiprocessing.queues import SimpleQueue +from multiprocessing.queues import SimpleQueue as MPSimpleQueue from os import DirEntry from re import Pattern, Match from types import GenericAlias, MappingProxyType, AsyncGeneratorType @@ -81,7 +81,7 @@ class BaseTest(unittest.TestCase): SplitResult, ParseResult, ValueProxy, ApplyResult, WeakSet, ReferenceType, ref, - ShareableList, SimpleQueue, + ShareableList, MPSimpleQueue, Future, _WorkItem, Morsel] if ctypes is not None: |