From 4c192d3ab7a061ef76ead99d7c446d143a18d401 Mon Sep 17 00:00:00 2001 From: squidfunk Date: Tue, 10 Oct 2023 08:44:55 +0200 Subject: [PATCH] Fixed group plugin compatibility with Python < 3.10 --- material/plugins/group/config.py | 4 +--- material/plugins/group/plugin.py | 2 ++ src/plugins/group/config.py | 4 +--- src/plugins/group/plugin.py | 2 ++ 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/material/plugins/group/config.py b/material/plugins/group/config.py index fb19222ab..198562123 100644 --- a/material/plugins/group/config.py +++ b/material/plugins/group/config.py @@ -18,8 +18,6 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -from __future__ import annotations - from mkdocs.config.config_options import Type from mkdocs.config.base import Config @@ -30,4 +28,4 @@ from mkdocs.config.base import Config # Group plugin configuration class GroupConfig(Config): enabled = Type(bool, default = False) - plugins = Type(list | dict) + plugins = Type((list, dict)) diff --git a/material/plugins/group/plugin.py b/material/plugins/group/plugin.py index 4ab13dbf3..b2b334d99 100644 --- a/material/plugins/group/plugin.py +++ b/material/plugins/group/plugin.py @@ -18,6 +18,8 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. +from __future__ import annotations + import logging from collections.abc import Callable diff --git a/src/plugins/group/config.py b/src/plugins/group/config.py index fb19222ab..198562123 100644 --- a/src/plugins/group/config.py +++ b/src/plugins/group/config.py @@ -18,8 +18,6 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -from __future__ import annotations - from mkdocs.config.config_options import Type from mkdocs.config.base import Config @@ -30,4 +28,4 @@ from mkdocs.config.base import Config # Group plugin configuration class GroupConfig(Config): enabled = Type(bool, default = False) - plugins = Type(list | dict) + plugins = Type((list, dict)) diff --git a/src/plugins/group/plugin.py b/src/plugins/group/plugin.py index 4ab13dbf3..b2b334d99 100644 --- a/src/plugins/group/plugin.py +++ b/src/plugins/group/plugin.py @@ -18,6 +18,8 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. +from __future__ import annotations + import logging from collections.abc import Callable