diff --git a/kallithea/model/db.py b/kallithea/model/db.py --- a/kallithea/model/db.py +++ b/kallithea/model/db.py @@ -30,8 +30,10 @@ import collections import datetime import functools import hashlib +import importlib.metadata import logging import os +import platform import time import traceback @@ -306,11 +308,8 @@ class Setting(meta.Base, BaseDbModel): @classmethod def get_server_info(cls): - import platform - - import pkg_resources - - mods = [(p.project_name, p.version) for p in pkg_resources.working_set] + # Python 3.9 PathDistribution doesn't have .name + mods = set((p.metadata['Name'], p.version) for p in importlib.metadata.distributions()) info = { 'modules': sorted(mods, key=lambda k: k[0].lower()), 'py_version': platform.python_version(),