From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 19 Jan 2022 22:12:25 +0000 (-0800)
Subject: bpo-46437: remove useless `hasattr` from `test_typing` (GH-30704)
X-Git-Tag: v3.9.11~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b51926ee9838e746a5cdb08c7eb985646bd133c;p=thirdparty%2FPython%2Fcpython.git

bpo-46437: remove useless `hasattr` from `test_typing` (GH-30704)

(cherry picked from commit 263c0dd16017613c5ea2fbfc270be4de2b41b5ad)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
---

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index cb6be2cee87d..17da4b81f519 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -3230,11 +3230,10 @@ class CollectionsAbcTests(BaseTestCase):
         self.assertNotIsInstance(42, typing.Container)
 
     def test_collection(self):
-        if hasattr(typing, 'Collection'):
-            self.assertIsInstance(tuple(), typing.Collection)
-            self.assertIsInstance(frozenset(), typing.Collection)
-            self.assertIsSubclass(dict, typing.Collection)
-            self.assertNotIsInstance(42, typing.Collection)
+        self.assertIsInstance(tuple(), typing.Collection)
+        self.assertIsInstance(frozenset(), typing.Collection)
+        self.assertIsSubclass(dict, typing.Collection)
+        self.assertNotIsInstance(42, typing.Collection)
 
     def test_abstractset(self):
         self.assertIsInstance(set(), typing.AbstractSet)
@@ -4321,8 +4320,9 @@ class AllTests(BaseTestCase):
         self.assertIn('ValuesView', a)
         self.assertIn('cast', a)
         self.assertIn('overload', a)
-        if hasattr(contextlib, 'AbstractContextManager'):
-            self.assertIn('ContextManager', a)
+        # Context managers.
+        self.assertIn('ContextManager', a)
+        self.assertIn('AsyncContextManager', a)
         # Check that io and re are not exported.
         self.assertNotIn('io', a)
         self.assertNotIn('re', a)
@@ -4336,8 +4336,6 @@ class AllTests(BaseTestCase):
         self.assertIn('SupportsComplex', a)
 
     def test_all_exported_names(self):
-        import typing
-
         actual_all = set(typing.__all__)
         computed_all = {
             k for k, v in vars(typing).items()