Blob Blame History Raw
From bae7ef40c1f20e24a3a3583ddaf5d4dfa9416d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
Date: Mon, 11 Dec 2023 10:16:30 +0100
Subject: [PATCH] Use importlib_resources backport only on old Pythons

---
 Flask_Security_Too.egg-info/requires.txt   |  2 +-
 flask_security/babel.py                    |  7 ++-
 pyproject.toml                             |  2 +-
 requirements/dev.txt                       |  2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Flask_Security_Too.egg-info/requires.txt b/Flask_Security_Too.egg-info/requires.txt
index 3693637..23b18bf 100644
--- a/Flask_Security_Too.egg-info/requires.txt
+++ b/Flask_Security_Too.egg-info/requires.txt
@@ -6,7 +6,7 @@ email-validator>=2.0.0
 markupsafe>=2.1.0
 passlib>=1.7.4
 wtforms>=3.0.0
-importlib_resources>=5.10.0
+importlib_resources>=5.10.0; python_version < '3.7'

 [babel]
 babel>=2.12.1
diff --git a/flask_security/babel.py b/flask_security/babel.py
index 44c6d2f..09ca0ae 100644
--- a/flask_security/babel.py
+++ b/flask_security/babel.py
@@ -18,7 +18,12 @@
 from collections.abc import Iterable
 import atexit
 from contextlib import ExitStack
-from importlib_resources import files, as_file
+
+try:
+    from importlib.resources import files, as_file
+except ImportError:
+    # For Python < 3.7
+    from importlib_resources import files, as_file

 import typing as t

diff --git a/pyproject.toml b/pyproject.toml
index 4fa04c0..6d190f6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,7 +48,7 @@ dependencies = [
     "markupsafe>=2.1.0",
     "passlib>=1.7.4",
     "wtforms>=3.0.0",  # for form-level errors
-    "importlib_resources>=5.10.0",
+    "importlib_resources>=5.10.0;python_version<'3.7'",
 ]

 [project.optional-dependencies]
diff --git a/requirements/dev.txt b/requirements/dev.txt
index f97dcc2..87929e8 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -20,4 +20,4 @@ passlib
 blinker
 email-validator
 itsdangerous
-importlib_resources>=5.10.0
+importlib_resources>=5.10.0; python_version < '3.7'
--
2.43.0