Fix entry_points

influxio/util/compat.py

@@ -0,0 +1,13 @@
+import sys
+import typing
+
+if typing.TYPE_CHECKING:
+    from importlib.metadata import EntryPoints
+
+
+def entry_points(**params) -> "EntryPoints":
+    if sys.version_info <= (3, 8):
+        from importlib_metadata import entry_points
+    else:
+        from importlib.metadata import entry_points
+    return entry_points(**params)

influxio/util/db.py

@@ -4,17 +4,11 @@ def get_sqlalchemy_dialects():
 
     TODO: Synchronize with influxio.util.report.
     """
-    from importlib.metadata import entry_points
-
     import sqlalchemy.dialects
 
-    dialects = list(sqlalchemy.dialects.__all__)
-    try:
-        eps = entry_points(group="sqlalchemy.dialects")
-    except TypeError as ex:
-        if "unexpected keyword argument" in str(ex):
-            from importlib_metadata import entry_points
+    from influxio.util.compat import entry_points
 
-            eps = entry_points(group="sqlalchemy.dialects")
+    dialects = list(sqlalchemy.dialects.__all__)
+    eps = entry_points(group="sqlalchemy.dialects")
     dialects += [dialect.name for dialect in eps]
     return sorted(set(dialects))

influxio/util/report.py

@@ -77,11 +77,10 @@ def platform():
         print()
 
         # SQLAlchemy
-        # TODO: Synchronize with influxio.util.db.
-        from importlib.metadata import entry_points
-
         import sqlalchemy.dialects
 
+        from influxio.util.compat import entry_points
+
         subsection("SQLAlchemy")
         print(bullet_item(list(sqlalchemy.dialects.__all__), label="Dialects built-in"))
         eps = entry_points(group="sqlalchemy.dialects")