importlib_metadata removed deprecated entry point interfaces

celery · Oct 3, 2022 · d3addea · d3addea
1 parent 7c1dcd0
commit d3addea
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/celery/bin/celery.py b/celery/bin/celery.py
@@ -1,5 +1,6 @@
 """Celery Command Line Interface."""
 import os
+import sys
 import pathlib
 import traceback
 
@@ -75,7 +76,16 @@ def convert(self, value, param, ctx):
 APP = App()
 
 
-@with_plugins(entry_points().get('celery.commands', []))
+if sys.version_info >= (3,10):
+    _PLUGINS = entry_points(group='celery.commands')
+else:
+    try:
+        _PLUGINS = entry_points().get('celery.commands', [])
+    except AttributeError:
+        _PLUGINS = entry_points().select('celery.commands', [])
+
+
+@with_plugins(_PLUGINS)
 @click.group(cls=DYMGroup, invoke_without_command=True)
 @click.option('-A',
               '--app',

diff --git a/celery/utils/imports.py b/celery/utils/imports.py
@@ -141,7 +141,14 @@ def gen_task_name(app, name, module_name):
 
 
 def load_extension_class_names(namespace):
-    for ep in entry_points().get(namespace, []):
+    if sys.version_info >= (3,10):
+        _entry_points = entry_points(group='celery.commands')
+    else:
+        try:
+            _entry_points = entry_points().get('celery.commands', [])
+        except AttributeError:
+            _entry_points = entry_points().select('celery.commands', [])
+    for ep in _entry_points:
         yield ep.name, ep.value