Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpo-32218: make Flag and IntFlag members iterable #22221

Merged
merged 1 commit into from
Sep 16, 2020

Conversation

ethanfurman
Copy link
Member

@ethanfurman ethanfurman commented Sep 12, 2020

Member and member combinations can now be iterated over:

class Color(Flag):
    RED = 1
    BLUE = 2
    GREEN = 4

purple = Color.RED | Color.BLUE
list(purple)
# [<Color.BLUE: 2>, <Color.RED: 1>]

https://bugs.python.org/issue32218

Copy link
Member

@corona10 corona10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO, we should notice this feature on whatsnews for 3.10.

@ethanfurman ethanfurman deleted the issue_32218-enum_iter branch September 13, 2020 18:19
@ethanfurman ethanfurman restored the issue_32218-enum_iter branch September 13, 2020 18:20
@ethanfurman ethanfurman reopened this Sep 16, 2020
@ethanfurman
Copy link
Member Author

News entry added.

@ethanfurman ethanfurman merged commit 7219e27 into python:master Sep 16, 2020
@ethanfurman ethanfurman deleted the issue_32218-enum_iter branch September 17, 2020 00:34
@belm0
Copy link
Contributor

belm0 commented Oct 11, 2020

this PR should have cited https://bugs.python.org/issue38250

Comment on lines +713 to +717
:class:`Flag` members can also be iterated over::

>>> purple = Color.RED | Color.BLUE
>>> list(purple)
[<Color.BLUE: 2>, <Color.RED: 1>]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The meaning of "members" should be clarified. Specifically, the iteration intentionally omits aliases and compound members.

The tests should verify this.

I would describe it as "iterating over the bits of a flag value", because that's what it does. Using "bits" should be OK since Flag is documented as supporting bitwise operators.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree.

Comment on lines +731 to +734
def __iter__(self):
members, extra_flags = _decompose(self.__class__, self.value)
return (m for m in members if m._value_ != 0)

Copy link
Contributor

@belm0 belm0 Oct 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The _decompose function is heavyweight (fairly complex and includes sorting). I wouldn't expect this kind of overhead when iterating flag bits.

I can think of two efficient ways:

  1. compare to all members of the Flag class, excluding 0 and non-power-of-2:
return (v for v in self.__class__ if v.value != 0 and (v.value & (v.value-1) == 0) and v in self)
  1. walk through the bits with a helper
@staticmethod
def _bits(n):
    while n:
        b = n & (~n+1)
        yield b
        n ^= b

def __iter__(self):
    return (self.__class__(v) for v in self._bits(self._value_))

in fact _decompose is used in other places, like __invert__, making these operations really slow. Really the set of available bits should be available in a class-only attribute, like _all_.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

proposal (2) is 2x faster than the implementation in this PR, for an enum with only about 6 values...

>>> from enum import Flag, auto
>>> class Foo(Flag):
...     NONE = 0
...     A = auto()
...     B = auto()
...     C = auto()
...     C2 = C
...     AB = A | B
...     D = auto()
...     E = auto()
...     F = auto()
...
>>> x = Foo.A | Foo.B | Foo.D | Foo.F
>>> import timeit
>>> timeit.timeit('list(x)', globals=locals(), number=10000)
0.6332780510000013

proposal (2):

>>> timeit.timeit('list(x)', globals=locals(), number=10000)
0.36078684099999236

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have become increasingly unhappy with the the multiple calls to _decompose. Your ideas (and others, too) are welcome.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have become increasingly unhappy with the the multiple calls to _decompose. Your ideas (and others, too) are welcome.

I do have ideas on it, and intended to open a separate issue for refactoring _decompose() and make a PR replacing it with something simpler, faster, and less buggy. (E.g. use the _bits() iterator; and I noticed that all callers of it either use the members or extra_flags output, never both; and the computation of extra_flags would be trivial if we had an __all__ attribute on the class.)

Regarding bugs, when it's used by repr() or str(), I don't think it's intended that a lone compound value is represented as-is, while a compound plus other value is represented as a redundant "compound plus underlying bits":

>>> class Foo(Flag):
...     A = auto()
...     B = auto()
...     C = auto()
...     BC = B | C
>>> repr(Foo.BC)
'<Foo.BC: 6>'
>>> repr(Foo.A | Foo.BC)
'<Foo.BC|C|B|A: 7>'

Comment on lines +731 to +734
def __iter__(self):
members, extra_flags = _decompose(self.__class__, self.value)
return (m for m in members if m._value_ != 0)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the use of __iter__() is problematic given that __contains__() has different semantics.

__contains__() returns true for members with value 0 or compound members, and __iter__() does not. It's bad form for these not to match.

>>> class Foo(Flag):
...     NONE = 0
...     A = 1
...     B = 2
...     C = 4
...     C2 = C
...     AB = A | B
>>> x = Foo.A | Foo.B
>>> list(x)
[<Foo.B: 2>, <Foo.A: 1>]
>>> Foo.NONE in x
True
>>> Foo.AB in x
True

I'd argue that __contains__() is completely broken and no one wants that behavior. But assuming that can't be changed, using __iter__() to iterate the bits is probably not a good idea.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that the zero-value flag should not be contained in a non-zero flag, but I have no problem with a compound flag showing up if its bits are present. You are welcome to try and convince me otherwise, but it will take more than "no one wants that behavior".

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I just learned that Flag.__contains__() is technically a subset operator:

>>> class Foo(Flag):
...     NONE = 0
...     A = 1
...     B = 2
...     C = 4
...     AB = A | B
>>> Foo.AB in (Foo.AB | Foo.C)
True
>>> (Foo.A|Foo.C) in (Foo.AB | Foo.C)
True

If that's the case, then actually it's OK for Foo.None in Foo.A to be True, since Foo.None is the empty set:

>>> set().issubset({1, 2})
True

I would not have made the API this way. __contains__ should be strictly for testing whether a bit is in the value (a Flag value is a set of enabled bits, in my mind), while issubset() and operator <= should be used for subset.

@belm0
Copy link
Contributor

belm0 commented Oct 11, 2020

also, since _decompose() itself has a bug that I noticed while reading it, the new iterator is buggy

_decompose() has incorrect output when the value input matches multiple compound values, so __iter__ incorrectly includes a compound value:

>>> class Foo(Flag):
...     NONE = 0
...     A = auto()
...     B = auto()
...     C = auto()
...     AB = A | B
...     ABC = A | B | C
>>> list(Foo.ABC)
[<Foo.C: 4>, <Foo.AB: 3>, <Foo.B: 2>, <Foo.A: 1>]

@ethanfurman
Copy link
Member Author

Yeah, I had recently noticed that myself. Only the one-bit flags should be in the iteration.

@belm0
Copy link
Contributor

belm0 commented Oct 15, 2020

I'm not sure why Flag allows definitions that cannot be decomposed into single-bit members.

>>> class Bizarre(Flag):
...     b = 3
...     c = 4
...     d = 6
...
Bizarre
>>> list(Bizarre(7))
[<Bizarre.d: 6>, <Bizarre.c: 4>, <Bizarre.b: 3>]

The iterator is no longer enumerating bits, and this defies any kind of efficient implementation of Flags based on bits (like trivial decomposition and calculation of extra_args).

I propose that Flag raise ValueError on such a definition. Supporting it is not worth the code complexity and efficiency cost.

@belm0
Copy link
Contributor

belm0 commented Oct 15, 2020

and this is nonsensical:

>>> ~Bizarre.d
<Bizarre.0: 0>

Other than making such definitions invalid, another approach is to use pseudo members to fill in missing bits. But they should be applied uniformly across the constructor, operations, and repr:

>>> class Bizarre(Flag):
...     b = 3
...     c = 4
...     d = 6
...
Bizarre
>>> list(Bizarre(7))
[<Bizarre.c: 4>, <Bizarre.2: 2>, <Bizarre.1: 1>]
>>> Bizarre(2)
<Bizarre.2: 2>
>>> Bizarre(8)
ValueError: 8 is not a valid Bizarre
>>> ~Bizarre.d
<Bizarre.1: 1>

@belm0
Copy link
Contributor

belm0 commented Oct 17, 2020

Flag handling of negative numbers is also dubious:

>>> class Foo(Flag):
...     X = 1
...
>>> Foo(1)
<Foo.X: 1>
>>> Foo(-1)
<Foo.X: 1>
>>> Foo(-2)
<Foo.0: 0>
>>> Foo(-3)
ValueError: -3 is not a valid Foo

I see the implementation in _missing_ (negative number is inverted and then inverted back after lookup)-- but what is the use case for this behavior?

I don't think Flag should allow negative numbers.

@belm0
Copy link
Contributor

belm0 commented Oct 17, 2020

summary of Flag bugs to file:

  1. str/repr problems - redundant members in some cases. It should really only return a compound if that is the original value, otherwise exclusively individual bit members.
  2. allowing definitions that cannot be decomposed into single-bit members - __invert__() makes little sense, makes fixing (1) almost impossible, breaks the new __iter__()
  3. negative value problems - especially nonsensical results of negative pseudo members

xzy3 pushed a commit to xzy3/cpython that referenced this pull request Oct 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants