[3.10] bpo-44654: Refactor and clean up the union type implementation (GH-27196) (GH-27219)
(cherry picked from commit 0fd27375cabd12e68a2f12cfeca11a2d5043429e)
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index 2d0e33f..b2e1130 100644
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -611,6 +611,18 @@ def test_method_descriptor_types(self):
self.assertIsInstance(int.from_bytes, types.BuiltinMethodType)
self.assertIsInstance(int.__new__, types.BuiltinMethodType)
+ def test_ellipsis_type(self):
+ self.assertIsInstance(Ellipsis, types.EllipsisType)
+
+ def test_notimplemented_type(self):
+ self.assertIsInstance(NotImplemented, types.NotImplementedType)
+
+ def test_none_type(self):
+ self.assertIsInstance(None, types.NoneType)
+
+
+class UnionTests(unittest.TestCase):
+
def test_or_types_operator(self):
self.assertEqual(int | str, typing.Union[int, str])
self.assertNotEqual(int | list, typing.Union[int, str])
@@ -657,18 +669,23 @@ def test_or_types_operator(self):
with self.assertRaises(TypeError):
Example() | int
x = int | str
- self.assertNotEqual(x, {})
+ self.assertEqual(x, int | str)
+ self.assertEqual(x, str | int)
+ self.assertNotEqual(x, {}) # should not raise exception
with self.assertRaises(TypeError):
- (int | str) < typing.Union[str, int]
+ x < x
with self.assertRaises(TypeError):
- (int | str) < (int | bool)
+ x <= x
+ y = typing.Union[str, int]
with self.assertRaises(TypeError):
- (int | str) <= (int | str)
+ x < y
+ y = int | bool
with self.assertRaises(TypeError):
- # Check that we don't crash if typing.Union does not have a tuple in __args__
- x = typing.Union[str, int]
- x.__args__ = [str, int]
- (int | str ) == x
+ x < y
+ # Check that we don't crash if typing.Union does not have a tuple in __args__
+ y = typing.Union[str, int]
+ y.__args__ = [str, int]
+ self.assertEqual(x, y)
def test_hash(self):
self.assertEqual(hash(int | str), hash(str | int))
@@ -873,15 +890,6 @@ def test_or_type_operator_reference_cycle(self):
self.assertLessEqual(sys.gettotalrefcount() - before, leeway,
msg='Check for union reference leak.')
- def test_ellipsis_type(self):
- self.assertIsInstance(Ellipsis, types.EllipsisType)
-
- def test_notimplemented_type(self):
- self.assertIsInstance(NotImplemented, types.NotImplementedType)
-
- def test_none_type(self):
- self.assertIsInstance(None, types.NoneType)
-
class MappingProxyTests(unittest.TestCase):
mappingproxy = types.MappingProxyType
diff --git a/Lib/typing.py b/Lib/typing.py
index 1823cb8..508f4b6 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -1181,7 +1181,7 @@ def copy_with(self, params):
return Union[params]
def __eq__(self, other):
- if not isinstance(other, _UnionGenericAlias):
+ if not isinstance(other, (_UnionGenericAlias, types.Union)):
return NotImplemented
return set(self.__args__) == set(other.__args__)