Skip to content

Commit 0404031

Browse files
committed
Restore py3.9 backwards compatibility
1 parent 1ffab31 commit 0404031

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"Operating System :: OS Independent",
3737
],
3838
platforms="Posix; MacOS X; Windows",
39-
install_requires=["argcomplete", "python-dateutil", "yamcs-client>=1.12.0"],
39+
install_requires=["argcomplete", "python-dateutil", "yamcs-client>=1.12.1"],
4040
extras_require={"kerberos": ["yamcs-client-kerberos>=1.3.0"]},
4141
include_package_data=True,
4242
zip_safe=False,

src/yamcs/cli/__main__.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,11 @@ def main():
9595
TablesCommand(subparsers)
9696

9797
# Discover subcommand plugins
98-
for entry in entry_points(group="yamcs.cli.subcommands"):
98+
try:
99+
eps = entry_points(group="yamcs.cli.subcommands")
100+
except TypeError: # < Python 3.10
101+
eps = entry_points().get("yamcs.cli.subcommands", [])
102+
for entry in eps:
99103
subcommand_cls = entry.load()
100104
subcommand_cls(subparsers)
101105

0 commit comments

Comments
 (0)