mirror of
https://github.com/jazzband/django-axes.git
synced 2026-03-16 22:30:23 +00:00
Bugfix #921 cannot import name 'get_distribution'
Replace `pkg_resources` with `importlib` solution to fix https://github.com/jazzband/django-axes/issues/921 Because `importlib.metadata` is new in Python 3.8, fallback to old `setuptools` solution.
This commit is contained in:
parent
5c7bea2a42
commit
ca42b0f7dc
2 changed files with 10 additions and 5 deletions
|
|
@ -1,4 +1,8 @@
|
|||
from pkg_resources import get_distribution
|
||||
try:
|
||||
from importlib.metadata import version # New in Python 3.8
|
||||
except ImportError:
|
||||
from pkg_resources import get_distribution # from setuptools, deprecated
|
||||
|
||||
|
||||
__version__ = get_distribution("django-axes").version
|
||||
__version__ = get_distribution('django-axes').version
|
||||
else:
|
||||
__version__ = version('django-axes')
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
from logging import getLogger
|
||||
|
||||
from django import apps
|
||||
from pkg_resources import get_distribution
|
||||
|
||||
from axes import __version__
|
||||
|
||||
log = getLogger(__name__)
|
||||
|
||||
|
|
@ -40,7 +41,7 @@ class AppConfig(apps.AppConfig):
|
|||
mode = "blocking by IP only"
|
||||
log.info(
|
||||
"AXES: BEGIN version %s, %s",
|
||||
get_distribution("django-axes").version,
|
||||
__version__,
|
||||
mode,
|
||||
)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue