Skip to content

Commit 2db2464

Browse files
kageurufurogerlz
authored andcommitted
Using importlib_metadata to backport to Python 3.9
1 parent 5ebe251 commit 2db2464

4 files changed

Lines changed: 32 additions & 3 deletions

File tree

klippy/printer.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
# This file may be distributed under the terms of the GNU GPLv3 license.
66

77
import sys, os, gc, optparse, logging, time, collections
8-
import importlib, importlib.metadata, importlib.util
8+
import importlib, importlib.util
9+
import importlib_metadata
910

1011
from . import compat
1112
from . import util, reactor, queuelogger, msgproto
@@ -146,7 +147,7 @@ def load_object(self, config, section, default=configfile.sentinel):
146147
plugins_spec = importlib.util.find_spec(
147148
f".{module_name}", "klippy.plugins"
148149
)
149-
entrypoints = importlib.metadata.entry_points(
150+
entrypoints = importlib_metadata.entry_points(
150151
group="kalico.plugins", name=module_name
151152
)
152153
if entrypoints:
@@ -557,7 +558,7 @@ def main():
557558
extra_git_desc += "\nRemote: %s" % (git_info["remote"])
558559
extra_git_desc += "\nTracked URL: %s" % (git_info["url"])
559560

560-
plugins = importlib.metadata.entry_points(group="kalico.plugins")
561+
plugins = importlib_metadata.entry_points(group="kalico.plugins")
561562
for plugin in plugins:
562563
extra_git_desc += f"\nPlugin {plugin.dist.name}=={plugin.dist.version}"
563564
start_args["plugins"][plugin.dist.name] = plugin.dist.metadata.json

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ dependencies = [
1515
"pyserial==3.4",
1616
"python-can~=4.5",
1717
"setuptools==75.8.2 ; python_version >= '3.12'", # required by python-can < 4.3
18+
"importlib-metadata>=8.7.0",
1819
]
1920

2021
[tool.uv]

scripts/klippy-requirements.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ greenlet==3.0.3 ; python_full_version == '3.12.*'
1010
# via kalico
1111
greenlet==3.1.0 ; python_full_version >= '3.13'
1212
# via kalico
13+
importlib-metadata==8.7.0
14+
# via kalico
1315
jinja2==3.1.5
1416
# via kalico
1517
markupsafe==2.1.5
@@ -36,3 +38,5 @@ typing-extensions==4.13.2
3638
# via python-can
3739
wrapt==1.17.2
3840
# via python-can
41+
zipp==3.23.0
42+
# via importlib-metadata

uv.lock

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)