Blob Blame History Raw
From 97e887605b21a110e0ec304913930a8115987c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 3 Dec 2019 02:57:07 +0100
Subject: [PATCH] Use importlib.metadata from the standard library on Python
 3.8+ (#1086)

---
 kombu/utils/compat.py    | 6 +++++-
 requirements/default.txt | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/kombu/utils/compat.py b/kombu/utils/compat.py
index c5f0bf118..a741c4350 100644
--- a/kombu/utils/compat.py
+++ b/kombu/utils/compat.py
@@ -7,7 +7,11 @@
 from functools import wraps
 
 from contextlib import contextmanager
-import importlib_metadata
+
+try:
+    from importlib import metadata as importlib_metadata
+except ImportError:
+    import importlib_metadata
 
 from kombu.five import reraise
 
diff --git a/requirements/default.txt b/requirements/default.txt
index 67311143c..bf121e54c 100644
--- a/requirements/default.txt
+++ b/requirements/default.txt
@@ -1,2 +1,3 @@
+importlib-metadata>=0.18; python_version<"3.8"
 amqp>=2.5.2,<2.6
-importlib-metadata>=0.18
+