Skip to content

gh-111181: Fix enum doctests #111180

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.

Sign up for GitHub

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

Merged
ethanfurman merged 5 commits into from
Oct 30, 2023
Merged

gh-111181: Fix enum doctests #111180

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e5f4da
WIP
sobolevn Oct 21, 2023
cf97523
Merge branch 'main' into fix-enum-doctests
sobolevn Oct 22, 2023
a5491b5
Demo
sobolevn Oct 22, 2023
60d493e
Delete ex.py
sobolevn Oct 22, 2023
766639a
update code to match documentation
ethanfurman Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
update code to match documentation
  • Loading branch information
@ethanfurman
ethanfurman committed Oct 23, 2023
commit 766639a858fdd3569d38db6e473202a8a462a1e9
4 changes: 2 additions & 2 deletions Doc/howto/enum.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,8 +772,8 @@ be combined with them (but may lose :class:`IntFlag` membership::
>>> Perm.X | 4
<Perm.R|X: 5>

>>> Perm.X | 8
<Perm.X|8: 9>
>>> Perm.X + 8
9

.. note::

Expand Down
2 changes: 1 addition & 1 deletion Doc/library/enum.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ Data Types
... print('today is %s' % cls(date.today().isoweekday()).name)
...
>>> dir(Weekday.SATURDAY)
['FRIDAY', 'MONDAY', 'SATURDAY', 'SUNDAY', 'THURSDAY', 'TUESDAY', 'WEDNESDAY', '__class__', '__doc__', '__eq__', '__hash__', '__module__', 'name', 'today', 'value']
['__class__', '__doc__', '__eq__', '__hash__', '__module__', 'name', 'today', 'value']

.. method:: Enum._generate_next_value_(name, start, count, last_values)

Expand Down
11 changes: 5 additions & 6 deletions Lib/enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,14 +1189,13 @@ def __str__(self):

def __dir__(self):
"""
Returns all members and all public methods
Returns public methods and other interesting attributes.
"""
if self.__class__._member_type_ is object:
interesting = set(['__class__', '__doc__', '__eq__', '__hash__', '__module__', 'name', 'value'])
else:
interesting = set()
if self.__class__._member_type_ is not object:
interesting = set(object.__dir__(self))
for name in getattr(self, '__dict__', []):
if name[0] != '_':
if name[0] != '_' and name not in self._member_map_:
interesting.add(name)
for cls in self.__class__.mro():
for name, obj in cls.__dict__.items():
Expand All @@ -1209,7 +1208,7 @@ def __dir__(self):
else:
# in case it was added by `dir(self)`
interesting.discard(name)
else:
elif name not in self._member_map_:
interesting.add(name)
names = sorted(
set(['__class__', '__doc__', '__eq__', '__hash__', '__module__'])
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5171,7 +5171,7 @@ def member_dir(member):
allowed.add(name)
else:
allowed.discard(name)
else:
elif name not in member._member_map_:
allowed.add(name)
return sorted(allowed)

Expand Down