Skip to content

Commit

Permalink
Update doctest for compat with Python 3.10a7
Browse files Browse the repository at this point in the history
In Python 3.10, Enum's repr() no longer show the value
(https://bugs.python.org/issue40066).
  • Loading branch information
dlax committed Apr 19, 2021
1 parent d8ea467 commit 649e674
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 32 deletions.
48 changes: 24 additions & 24 deletions pgactivity/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ def duration_mode(key: Keystroke, mode: DurationMode) -> DurationMode:
>>> from blessed.keyboard import Keystroke as k
>>> duration_mode(k("42"), DurationMode.query)
<DurationMode.query: 1>
>>> duration_mode(k("T"), DurationMode.transaction)
<DurationMode.backend: 3>
>>> duration_mode(k("42"), DurationMode.query).name
'query'
>>> duration_mode(k("T"), DurationMode.transaction).name
'backend'
"""
if key == keys.CHANGE_DURATION_MODE:
return enum_next(mode)
Expand All @@ -56,10 +56,10 @@ def verbose_mode(key: Keystroke, mode: QueryDisplayMode) -> QueryDisplayMode:
>>> from blessed.keyboard import Keystroke as k
>>> verbose_mode(k("42"), QueryDisplayMode.truncate)
<QueryDisplayMode.truncate: 1>
>>> verbose_mode(k("v"), QueryDisplayMode.wrap_noindent)
<QueryDisplayMode.wrap: 3>
>>> verbose_mode(k("42"), QueryDisplayMode.truncate).name
'truncate'
>>> verbose_mode(k("v"), QueryDisplayMode.wrap_noindent).name
'wrap'
"""
if key == keys.CHANGE_DISPLAY_MODE:
return enum_next(mode)
Expand All @@ -73,10 +73,10 @@ def query_mode(key: Keystroke) -> Optional[QueryMode]:
>>> from blessed.keyboard import Keystroke as k
>>> query_mode(k("42"))
>>> query_mode(k("1"))
<QueryMode.activities: 'running queries'>
>>> query_mode(k(code=curses.KEY_F3))
<QueryMode.blocking: 'blocking queries'>
>>> query_mode(k("1")).name
'activities'
>>> query_mode(k(code=curses.KEY_F3)).name
'blocking'
"""
if key.is_sequence:
try:
Expand All @@ -100,24 +100,24 @@ def sort_key_for(
>>> sort_key_for(k("1"), QueryMode.activities, flag)
In activities mode, 'm', 'w', 't', ... keys are handled:
>>> sort_key_for(k("m"), QueryMode.activities, flag)
<SortKey.mem: 2>
>>> sort_key_for(k("w"), QueryMode.activities, flag)
<SortKey.write: 4>
>>> sort_key_for(k("t"), QueryMode.activities, flag)
<SortKey.duration: 5>
>>> sort_key_for(k("c"), QueryMode.activities, flag)
<SortKey.cpu: 1>
>>> sort_key_for(k("m"), QueryMode.activities, flag).name
'mem'
>>> sort_key_for(k("w"), QueryMode.activities, flag).name
'write'
>>> sort_key_for(k("t"), QueryMode.activities, flag).name
'duration'
>>> sort_key_for(k("c"), QueryMode.activities, flag).name
'cpu'
In other modes, the default sort key is always returned:
>>> sort_key_for(k("m"), QueryMode.waiting, flag)
<SortKey.duration: 5>
>>> sort_key_for(k("m"), QueryMode.waiting, flag).name
'duration'
When flag does not match given sort key, return None:
>>> flag ^= Flag.CPU
>>> sort_key_for(k("c"), QueryMode.activities, flag)
>>> sort_key_for(k("m"), QueryMode.activities, flag)
<SortKey.mem: 2>
>>> sort_key_for(k("m"), QueryMode.activities, flag).name
'mem'
>>> flag ^= Flag.MEM
>>> sort_key_for(k("m"), QueryMode.activities, flag)
"""
Expand Down
16 changes: 8 additions & 8 deletions pgactivity/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ def enum_next(e: E) -> E:
... summer = 3
... autumn = 4
>>> enum_next(Seasons.winter)
<Seasons.spring: 2>
>>> enum_next(Seasons.spring)
<Seasons.summer: 3>
>>> enum_next(Seasons.autumn)
<Seasons.winter: 1>
>>> enum_next(Seasons.winter).name
'spring'
>>> enum_next(Seasons.spring).name
'summer'
>>> enum_next(Seasons.autumn).name
'winter'
"""
return e.__class__((e.value % max(e.__class__)) + 1)

Expand Down Expand Up @@ -543,8 +543,8 @@ def column(self, key: str) -> Column:
"""Return the column matching 'key'.
>>> ui = UI.make()
>>> ui.column("cpu")
Column(name='CPU%', template_h='%6s ', mandatory=False, sort_key=<SortKey.cpu: 1>)
>>> ui.column("cpu") # doctest: +ELLIPSIS
Column(name='CPU%', template_h='%6s ', mandatory=False, sort_key=...)
>>> ui.column("gloups")
Traceback (most recent call last):
...
Expand Down

0 comments on commit 649e674

Please sign in to comment.