Skip to content

Commit a7153a2

Browse files
tonytony
committed
ruff . --select COM --fix
1 parent 9f1ab61 commit a7153a2

23 files changed

+64
-64
lines changed

‎docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"sidebar/navigation.html",
9999
"sidebar/projects.html",
100100
"sidebar/scroll-end.html",
101-
]
101+
],
102102
}
103103

104104
# linkify_issues

‎src/libtmux/_internal/query_list.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def keygetter(
6666

6767

6868
def parse_lookup(
69-
obj: "Mapping[str, t.Any]", path: str, lookup: str
69+
obj: "Mapping[str, t.Any]", path: str, lookup: str,
7070
) -> t.Optional[t.Any]:
7171
"""Check if field lookup key, e.g. "my__path__contains" has comparator, return val.
7272

‎src/libtmux/_vendor/version.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
],
3434
]
3535
CmpKey = Tuple[
36-
int, Tuple[int, ...], PrePostDevType, PrePostDevType, PrePostDevType, LocalType
36+
int, Tuple[int, ...], PrePostDevType, PrePostDevType, PrePostDevType, LocalType,
3737
]
3838
VersionComparisonMethod = Callable[[CmpKey, CmpKey], bool]
3939

4040
_Version = collections.namedtuple(
41-
"_Version", ["epoch", "release", "dev", "pre", "post", "local"]
41+
"_Version", ["epoch", "release", "dev", "pre", "post", "local"],
4242
)
4343

4444

@@ -220,7 +220,7 @@ def __init__(self, version: str) -> None:
220220
release=tuple(int(i) for i in match.group("release").split(".")),
221221
pre=_parse_letter_version(match.group("pre_l"), match.group("pre_n")),
222222
post=_parse_letter_version(
223-
match.group("post_l"), match.group("post_n1") or match.group("post_n2")
223+
match.group("post_l"), match.group("post_n1") or match.group("post_n2"),
224224
),
225225
dev=_parse_letter_version(match.group("dev_l"), match.group("dev_n")),
226226
local=_parse_local_version(match.group("local")),
@@ -468,7 +468,7 @@ def micro(self) -> int:
468468

469469

470470
def _parse_letter_version(
471-
letter: str, number: Union[str, bytes, SupportsInt]
471+
letter: str, number: Union[str, bytes, SupportsInt],
472472
) -> Optional[Tuple[str, int]]:
473473
if letter:
474474
# We consider there to be an implicit 0 in a pre-release if there is
@@ -529,7 +529,7 @@ def _cmpkey(
529529
# re-reverse it back into the correct order and make it a tuple and use
530530
# that for our sorting key.
531531
_release = tuple(
532-
reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release))))
532+
reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release)))),
533533
)
534534

535535
# We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.

‎src/libtmux/common.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
231231

232232
try:
233233
self.process = subprocess.Popen(
234-
cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
234+
cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
235235
)
236236
stdout, stderr = self.process.communicate()
237237
returncode = self.process.returncode
@@ -258,8 +258,8 @@ def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
258258

259259
logger.debug(
260260
"self.stdout for {cmd}: {stdout}".format(
261-
cmd=" ".join(cmd), stdout=self.stdout
262-
)
261+
cmd=" ".join(cmd), stdout=self.stdout,
262+
),
263263
)
264264

265265

@@ -285,7 +285,7 @@ def get_version() -> LooseVersion:
285285
return LooseVersion("%s-openbsd" % TMUX_MAX_VERSION)
286286
raise exc.LibTmuxException(
287287
"libtmux supports tmux %s and greater. This system"
288-
" is running tmux 1.3 or earlier." % TMUX_MIN_VERSION
288+
" is running tmux 1.3 or earlier." % TMUX_MIN_VERSION,
289289
)
290290
raise exc.VersionTooLow(proc.stderr)
291291

@@ -419,8 +419,8 @@ def has_minimum_version(raises: bool = True) -> bool:
419419
raise exc.VersionTooLow(
420420
"libtmux only supports tmux {} and greater. This system"
421421
" has {} installed. Upgrade your tmux to use libtmux.".format(
422-
TMUX_MIN_VERSION, get_version()
423-
)
422+
TMUX_MIN_VERSION, get_version(),
423+
),
424424
)
425425
else:
426426
return False

‎src/libtmux/exc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def __init__(
3838
if all(arg is not None for arg in [obj_key, obj_id, list_cmd, list_extra_args]):
3939
return super().__init__(
4040
f"Could not find {obj_key}={obj_id} for {list_cmd} "
41-
f'{list_extra_args if list_extra_args is not None else ""}'
41+
f'{list_extra_args if list_extra_args is not None else ""}',
4242
)
4343
return super().__init__("Could not find object")
4444

@@ -51,7 +51,7 @@ class BadSessionName(LibTmuxException):
5151
"""Disallowed session name for tmux (empty, contains periods or colons)."""
5252

5353
def __init__(
54-
self, reason: str, session_name: t.Optional[str] = None, *args: object
54+
self, reason: str, session_name: t.Optional[str] = None, *args: object,
5555
):
5656
msg = f"Bad session name: {reason}"
5757
if session_name is not None:

‎src/libtmux/neo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def _refresh(
170170
) -> None:
171171
assert isinstance(obj_id, str)
172172
obj = fetch_obj(
173-
obj_key=obj_key, obj_id=obj_id, list_cmd=list_cmd, server=self.server
173+
obj_key=obj_key, obj_id=obj_id, list_cmd=list_cmd, server=self.server,
174174
)
175175
assert obj is not None
176176
if obj is not None:
@@ -233,7 +233,7 @@ def fetch_obj(
233233
) -> OutputRaw:
234234
"""Fetch raw data from tmux command."""
235235
obj_formatters_filtered = fetch_objs(
236-
server=server, list_cmd=list_cmd, list_extra_args=list_extra_args
236+
server=server, list_cmd=list_cmd, list_extra_args=list_extra_args,
237237
)
238238

239239
obj = None

‎src/libtmux/pane.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ def send_keys(
245245

246246
@overload
247247
def display_message(
248-
self, cmd: str, get_text: "t.Literal[True]"
248+
self, cmd: str, get_text: "t.Literal[True]",
249249
) -> t.Union[str, t.List[str]]:
250250
...
251251

@@ -254,7 +254,7 @@ def display_message(self, cmd: str, get_text: "t.Literal[False]") -> None:
254254
...
255255

256256
def display_message(
257-
self, cmd: str, get_text: bool = False
257+
self, cmd: str, get_text: bool = False,
258258
) -> t.Optional[t.Union[str, t.List[str]]]:
259259
"""Display message to pane.
260260

‎src/libtmux/pytest_plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def session_params() -> t.Dict[str, t.Any]:
185185

186186
@pytest.fixture(scope="function")
187187
def session(
188-
request: pytest.FixtureRequest, session_params: t.Dict[str, t.Any], server: Server
188+
request: pytest.FixtureRequest, session_params: t.Dict[str, t.Any], server: Server,
189189
) -> "Session":
190190
"""Return new, temporary :class:`libtmux.Session`.
191191

‎src/libtmux/server.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ def new_session(
439439
logger.info("session %s exists. killed it." % session_name)
440440
else:
441441
raise exc.TmuxSessionExists(
442-
"Session named %s exists" % session_name
442+
"Session named %s exists" % session_name,
443443
)
444444

445445
logger.debug(f"creating session {session_name}")
@@ -486,11 +486,11 @@ def new_session(
486486
os.environ["TMUX"] = env
487487

488488
session_formatters = dict(
489-
zip(["session_id"], session_stdout.split(formats.FORMAT_SEPARATOR))
489+
zip(["session_id"], session_stdout.split(formats.FORMAT_SEPARATOR)),
490490
)
491491

492492
return Session.from_session_id(
493-
server=self, session_id=session_formatters["session_id"]
493+
server=self, session_id=session_formatters["session_id"],
494494
)
495495

496496
#

‎src/libtmux/session.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def refresh(self) -> None:
7777
"""Refresh session attributes from tmux."""
7878
assert isinstance(self.session_id, str)
7979
return super()._refresh(
80-
obj_key="session_id", obj_id=self.session_id, list_cmd="list-sessions"
80+
obj_key="session_id", obj_id=self.session_id, list_cmd="list-sessions",
8181
)
8282

8383
@classmethod
@@ -169,7 +169,7 @@ def cmd(self, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
169169
"""
170170

171171
def set_option(
172-
self, option: str, value: t.Union[str, int], _global: bool = False
172+
self, option: str, value: t.Union[str, int], _global: bool = False,
173173
) -> "Session":
174174
"""Set option ``$ tmux set-option <option> <value>``.
175175
@@ -220,7 +220,7 @@ def set_option(
220220
return self
221221

222222
def show_options(
223-
self, _global: t.Optional[bool] = False
223+
self, _global: t.Optional[bool] = False,
224224
) -> t.Dict[str, t.Union[str, int]]:
225225
"""Return dict of options for the session.
226226
@@ -258,7 +258,7 @@ def show_options(
258258
return session_options
259259

260260
def show_option(
261-
self, option: str, _global: bool = False
261+
self, option: str, _global: bool = False,
262262
) -> t.Optional[t.Union[str, int, bool]]:
263263
"""Return option value for the target session.
264264
@@ -488,7 +488,7 @@ def new_window(
488488
window_args += (f"-e{k}={v}",)
489489
else:
490490
logger.warning(
491-
"Cannot set up environment as tmux 3.0 or newer is required."
491+
"Cannot set up environment as tmux 3.0 or newer is required.",
492492
)
493493

494494
if window_shell:
@@ -502,11 +502,11 @@ def new_window(
502502
window_output = cmd.stdout[0]
503503

504504
window_formatters = dict(
505-
zip(["window_id"], window_output.split(FORMAT_SEPARATOR))
505+
zip(["window_id"], window_output.split(FORMAT_SEPARATOR)),
506506
)
507507

508508
return Window.from_window_id(
509-
server=self.server, window_id=window_formatters["window_id"]
509+
server=self.server, window_id=window_formatters["window_id"],
510510
)
511511

512512
def kill_window(self, target_window: t.Optional[str] = None) -> None:
@@ -604,7 +604,7 @@ def __getitem__(self, key: str) -> t.Any:
604604
605605
"""
606606
warnings.warn(
607-
f"Item lookups, e.g. session['{key}'] is deprecated", stacklevel=2
607+
f"Item lookups, e.g. session['{key}'] is deprecated", stacklevel=2,
608608
)
609609
return getattr(self, key)
610610

‎src/libtmux/test.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class RandomStrSequence:
2828
"""Factory to generate random string."""
2929

3030
def __init__(
31-
self, characters: str = "abcdefghijklmnopqrstuvwxyz0123456789_"
31+
self, characters: str = "abcdefghijklmnopqrstuvwxyz0123456789_",
3232
) -> None:
3333
"""Create a random letter / number generator. 8 chars in length.
3434
@@ -141,7 +141,7 @@ def get_test_session_name(server: "Server", prefix: str = TEST_SESSION_PREFIX) -
141141

142142

143143
def get_test_window_name(
144-
session: "Session", prefix: t.Optional[str] = TEST_SESSION_PREFIX
144+
session: "Session", prefix: t.Optional[str] = TEST_SESSION_PREFIX,
145145
) -> str:
146146
"""
147147
Faker to create a window name that doesn't exist.
@@ -180,7 +180,7 @@ def get_test_window_name(
180180

181181
@contextlib.contextmanager
182182
def temp_session(
183-
server: Server, *args: t.Any, **kwargs: t.Any
183+
server: Server, *args: t.Any, **kwargs: t.Any,
184184
) -> t.Generator["Session", t.Any, t.Any]:
185185
"""
186186
Return a context manager with a temporary session.
@@ -230,7 +230,7 @@ def temp_session(
230230

231231
@contextlib.contextmanager
232232
def temp_window(
233-
session: "Session", *args: t.Any, **kwargs: t.Any
233+
session: "Session", *args: t.Any, **kwargs: t.Any,
234234
) -> t.Generator["Window", t.Any, t.Any]:
235235
"""
236236
Return a context manager with a temporary window.

‎src/libtmux/window.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ def split_window(
258258
tmux_args += (f"-e{k}={v}",)
259259
else:
260260
logger.warning(
261-
"Cannot set up environment as tmux 3.0 or newer is required."
261+
"Cannot set up environment as tmux 3.0 or newer is required.",
262262
)
263263

264264
if shell:
@@ -399,7 +399,7 @@ def show_window_options(self, g: t.Optional[bool] = False) -> "WindowOptionDict"
399399
return window_options
400400

401401
def show_window_option(
402-
self, option: str, g: bool = False
402+
self, option: str, g: bool = False,
403403
) -> t.Optional[t.Union[str, int]]:
404404
"""Return option value for the target window.
405405
@@ -486,7 +486,7 @@ def kill_window(self) -> None:
486486
raise exc.LibTmuxException(proc.stderr)
487487

488488
def move_window(
489-
self, destination: str = "", session: t.Optional[str] = None
489+
self, destination: str = "", session: t.Optional[str] = None,
490490
) -> "Window":
491491
"""Move current :class:`Window` object ``$ tmux move-window``.
492492

‎tests/legacy_api/test_common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ class SessionCheckName(t.NamedTuple):
215215
],
216216
)
217217
def test_session_check_name(
218-
session_name: t.Optional[str], raises: bool, exc_msg_regex: t.Optional[str]
218+
session_name: t.Optional[str], raises: bool, exc_msg_regex: t.Optional[str],
219219
) -> None:
220220
"""Verify session_check_name()."""
221221
if raises:

‎tests/legacy_api/test_pane.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ def test_capture_pane(session: Session) -> None:
8383
pane_contents = "\n".join(pane.capture_pane())
8484
assert pane_contents == "$"
8585
pane.send_keys(
86-
r'printf "\n%s\n" "Hello World !"', literal=True, suppress_history=False
86+
r'printf "\n%s\n" "Hello World !"', literal=True, suppress_history=False,
8787
)
8888
pane_contents = "\n".join(pane.capture_pane())
8989
assert pane_contents == r'$ printf "\n%s\n" "Hello World !"{}'.format(
90-
"\n\nHello World !\n$"
90+
"\n\nHello World !\n$",
9191
)

‎tests/legacy_api/test_session.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ def test_unset_environment(session: Session) -> None:
220220
[("hey.period", True), ("hey:its a colon", True), ("hey moo", False)],
221221
)
222222
def test_periods_raise_badsessionname(
223-
server: Server, session: Session, session_name: str, raises: bool
223+
server: Server, session: Session, session_name: str, raises: bool,
224224
) -> None:
225225
"""Verify session names with periods raise BadSessionName."""
226226
new_name = session_name + "moo" # used for rename / switch

‎tests/legacy_api/test_tmuxobject.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def test_find_where_multiple_infos(server: Server, session: Session) -> None:
6060
assert session_name is not None
6161

6262
find_where = server.find_where(
63-
{"session_id": session_id, "session_name": session_name}
63+
{"session_id": session_id, "session_name": session_name},
6464
)
6565

6666
assert find_where == session
@@ -74,7 +74,7 @@ def test_find_where_multiple_infos(server: Server, session: Session) -> None:
7474
assert window_index is not None
7575

7676
find_where_window = session.find_where(
77-
{"window_id": window_id, "window_index": window_index}
77+
{"window_id": window_id, "window_index": window_index},
7878
)
7979

8080
assert find_where_window == window
@@ -88,7 +88,7 @@ def test_find_where_multiple_infos(server: Server, session: Session) -> None:
8888
assert pane_tty is not None
8989

9090
find_where_pane = window.find_where(
91-
{"pane_id": pane_id, "pane_tty": pane_tty}
91+
{"pane_id": pane_id, "pane_tty": pane_tty},
9292
)
9393

9494
assert find_where_pane == pane
@@ -107,7 +107,7 @@ def test_where(server: Server, session: Session) -> None:
107107
assert session_name is not None
108108

109109
server_sessions = server.where(
110-
{"session_id": session_id, "session_name": session_name}
110+
{"session_id": session_id, "session_name": session_name},
111111
)
112112

113113
assert len(server_sessions) == 1
@@ -124,7 +124,7 @@ def test_where(server: Server, session: Session) -> None:
124124
assert window_index is not None
125125

126126
session_windows = session.where(
127-
{"window_id": window_id, "window_index": window_index}
127+
{"window_id": window_id, "window_index": window_index},
128128
)
129129

130130
assert len(session_windows) == 1

0 commit comments

Comments
 (0)