[Python-checkins] bpo-46437: remove useless `hasattr` from `test_typing` (#30704)

gvanrossum webhook-mailer at python.org
Wed Jan 19 16:24:31 EST 2022


https://github.com/python/cpython/commit/263c0dd16017613c5ea2fbfc270be4de2b41b5ad
commit: 263c0dd16017613c5ea2fbfc270be4de2b41b5ad
branch: main
author: Nikita Sobolev <mail at sobolevn.me>
committer: gvanrossum <gvanrossum at gmail.com>
date: 2022-01-19T13:24:27-08:00
summary:

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

files:
M Lib/test/test_typing.py

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 8d024514fcb84..ce0c940e2a112 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -3513,11 +3513,10 @@ def test_container(self):
         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)
@@ -5130,8 +5129,9 @@ def test_all(self):
         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)
@@ -5145,8 +5145,6 @@ def test_all(self):
         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()



More information about the Python-checkins mailing list