From: Saiyang Gou <gousaiyang@163.com>
Date: Fri, 9 Oct 2020 20:00:15 +0000 (-0700)
Subject: bpo-39481: Fix duplicate SimpleQueue type in test_genericalias.py (GH-22619)
X-Git-Tag: v3.10.0a2~219
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2c0a43699bd9023a69e3fa554f5488a2e17e278;p=thirdparty%2FPython%2Fcpython.git

bpo-39481: Fix duplicate SimpleQueue type in test_genericalias.py (GH-22619)



There are two different `SimpleQueue` types imported (from `multiprocessing.queues` and `queue`) in `Lib/test/test_genericalias.py`, the second one shadowing the first one, making the first one not actually tested. Fix by using different names.

Automerge-Triggered-By: @gvanrossum
---

diff --git a/Lib/test/test_genericalias.py b/Lib/test/test_genericalias.py
index 643fffc073e8..2979cfb55083 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: