From 5d7d0ee7e1db9c71660aa9a4ec630c31d8b3a320 Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Tue, 15 Jun 2021 17:12:26 -0700 Subject: [PATCH 1/2] sync current docs to 3.10 --- Doc/library/enum.rst | 2 +- Lib/enum.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst index e1263f1a0372dde..d53e3405e531ff6 100644 --- a/Doc/library/enum.rst +++ b/Doc/library/enum.rst @@ -576,7 +576,7 @@ Data Types ... NEON = 31 Traceback (most recent call last): ... - ValueError: invalid Flag 'Color': 'WHITE' is missing a named flag for value 8; 'NEON' is missing named flags for values 8, 16 + ValueError: invalid Flag 'Color': aliases WHITE and NEON are missing combined values of 0x18 [use enum.show_flag_values(value) for details] .. note:: diff --git a/Lib/enum.py b/Lib/enum.py index 0c6d8c1eb0e5441..672fb44cd41ba85 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -1637,7 +1637,7 @@ def __call__(self, enumeration): else: value = 'combined values of 0x%x' % missing_value raise ValueError( - 'invalid Flag %r: %s %s [use `enum.show_flag_values(value)` for details]' + 'invalid Flag %r: %s %s [use enum.show_flag_values(value) for details]' % (cls_name, alias, value) ) return enumeration From 34c6ddec47ef6c0bc58caba5ebdaa938e731b269 Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Tue, 15 Jun 2021 18:02:26 -0700 Subject: [PATCH 2/2] fix tests --- Lib/test/test_enum.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 956b8347b1e1cb9..54822b04b03531d 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -3591,7 +3591,7 @@ class Bizarre(Flag): self.assertEqual(Bizarre.d.value, 6) with self.assertRaisesRegex( ValueError, - "invalid Flag 'Bizarre': aliases b and d are missing combined values of 0x3 .use `enum.show_flag_values.value.` for details.", + "invalid Flag 'Bizarre': aliases b and d are missing combined values of 0x3 .use enum.show_flag_values.value. for details.", ): @verify(NAMED_FLAGS) class Bizarre(Flag): @@ -3610,7 +3610,7 @@ class Bizarre(IntFlag): self.assertEqual(Bizarre.d.value, 6) with self.assertRaisesRegex( ValueError, - "invalid Flag 'Bizarre': alias d is missing value 0x2 .use `enum.show_flag_values.value.` for details.", + "invalid Flag 'Bizarre': alias d is missing value 0x2 .use enum.show_flag_values.value. for details.", ): @verify(NAMED_FLAGS) class Bizarre(IntFlag):