mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
gh-93820: Fix copy() regression in enum.Flag (GH-93876) (#93886)
GH-26658 introduced a regression in copy / pickle protocol for combined
`enum.Flag`s. `copy.copy(re.A | re.I)` would fail with
`AttributeError: ASCII|IGNORECASE`.
`enum.Flag` now has a `__reduce_ex__()` method that reduces flags by
combined value, not by combined name.
(cherry picked from commit 05b32c1c79
)
Co-authored-by: Christian Heimes <christian@python.org>
Co-authored-by: Christian Heimes <christian@python.org>
This commit is contained in:
parent
74561095d9
commit
3fbf5c6427
3 changed files with 33 additions and 0 deletions
|
@ -1372,6 +1372,9 @@ class Flag(Enum, boundary=STRICT):
|
|||
Support for flags
|
||||
"""
|
||||
|
||||
def __reduce_ex__(self, proto):
|
||||
return self.__class__, (self._value_, )
|
||||
|
||||
_numeric_repr_ = repr
|
||||
|
||||
def _generate_next_value_(name, start, count, last_values):
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
import copy
|
||||
import enum
|
||||
import doctest
|
||||
import inspect
|
||||
|
@ -732,6 +733,13 @@ class _MinimalOutputTests:
|
|||
self.assertFormatIsValue('{:5.2}', TE.third)
|
||||
self.assertFormatIsValue('{:f}', TE.third)
|
||||
|
||||
def test_copy(self):
|
||||
TE = self.MainEnum
|
||||
copied = copy.copy(TE)
|
||||
self.assertEqual(copied, TE)
|
||||
deep = copy.deepcopy(TE)
|
||||
self.assertEqual(deep, TE)
|
||||
|
||||
|
||||
class _FlagTests:
|
||||
|
||||
|
@ -2652,6 +2660,26 @@ class TestSpecial(unittest.TestCase):
|
|||
self.assertTrue(isinstance(MyIntFlag.ONE | MyIntFlag.TWO, MyIntFlag), MyIntFlag.ONE | MyIntFlag.TWO)
|
||||
self.assertTrue(isinstance(MyIntFlag.ONE | 2, MyIntFlag))
|
||||
|
||||
def test_int_flags_copy(self):
|
||||
class MyIntFlag(IntFlag):
|
||||
ONE = 1
|
||||
TWO = 2
|
||||
FOUR = 4
|
||||
|
||||
flags = MyIntFlag.ONE | MyIntFlag.TWO
|
||||
copied = copy.copy(flags)
|
||||
deep = copy.deepcopy(flags)
|
||||
self.assertEqual(copied, flags)
|
||||
self.assertEqual(deep, flags)
|
||||
|
||||
flags = MyIntFlag.ONE | MyIntFlag.TWO | 8
|
||||
copied = copy.copy(flags)
|
||||
deep = copy.deepcopy(flags)
|
||||
self.assertEqual(copied, flags)
|
||||
self.assertEqual(deep, flags)
|
||||
self.assertEqual(copied.value, 1 | 2 | 8)
|
||||
|
||||
|
||||
class TestOrder(unittest.TestCase):
|
||||
"test usage of the `_order_` attribute"
|
||||
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Fixed a regression when :func:`copy.copy`-ing :class:`enum.Flag` with
|
||||
multiple flag members.
|
Loading…
Add table
Add a link
Reference in a new issue