From 9045919bfa820379a66ea67219f79ef6d9ecab49 Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Sat, 10 Apr 2021 20:00:05 -0700 Subject: bpo-43772: Fix TypeVar.__ror__ (GH-25339) --- Lib/test/test_typing.py | 10 ++++++++++ Lib/typing.py | 4 ++-- .../next/Library/2021-04-10-19-14-49.bpo-43772.Bxq0zQ.rst | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2021-04-10-19-14-49.bpo-43772.Bxq0zQ.rst diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 7183686..82c517a 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -186,6 +186,16 @@ class TypeVarTests(BaseTestCase): self.assertEqual(Union[X, int].__parameters__, (X,)) self.assertIs(Union[X, int].__origin__, Union) + def test_or(self): + X = TypeVar('X') + # use a string because str doesn't implement + # __or__/__ror__ itself + self.assertEqual(X | "x", Union[X, "x"]) + self.assertEqual("x" | X, Union["x", X]) + # make sure the order is correct + self.assertEqual(get_args(X | "x"), (X, ForwardRef("x"))) + self.assertEqual(get_args("x" | X), (ForwardRef("x"), X)) + def test_union_constrained(self): A = TypeVar('A', str, bytes) self.assertNotEqual(Union[A, str], Union[A]) diff --git a/Lib/typing.py b/Lib/typing.py index 6461ba2..a24c01f 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -648,8 +648,8 @@ class _TypeVarLike: def __or__(self, right): return Union[self, right] - def __ror__(self, right): - return Union[self, right] + def __ror__(self, left): + return Union[left, self] def __repr__(self): if self.__covariant__: diff --git a/Misc/NEWS.d/next/Library/2021-04-10-19-14-49.bpo-43772.Bxq0zQ.rst b/Misc/NEWS.d/next/Library/2021-04-10-19-14-49.bpo-43772.Bxq0zQ.rst new file mode 100644 index 0000000..648357b --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-04-10-19-14-49.bpo-43772.Bxq0zQ.rst @@ -0,0 +1 @@ +Fixed the return value of ``TypeVar.__ror__``. Patch by Jelle Zijlstra. -- cgit v0.12