Removed theme._vars and accessed keys directly (#315)

ultrabug · Nov 12, 2024 · c72c5fe · c72c5fe
1 parent 1d1501d
commit c72c5fe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/mkdocs_static_i18n/reconfigure.py b/mkdocs_static_i18n/reconfigure.py
@@ -133,7 +133,7 @@ def reconfigure_mkdocs_config(self, config: MkDocsConfig) -> MkDocsConfig:
             else:
                 config = self.reconfigure_material_theme(config, self.current_language)
                 # warn about navigation.instant incompatibility
-                if "navigation.instant" in config.theme._vars.get("features", []):
+                if "navigation.instant" in config.theme.get("features", []):
                     log.warning(
                         "mkdocs-material language switcher contextual link is not "
                         "compatible with theme.features = navigation.instant"
@@ -154,7 +154,7 @@ def reconfigure_mkdocs_config(self, config: MkDocsConfig) -> MkDocsConfig:
 
         # Install a i18n aware version of sitemap.xml if not provided by the user
         if not Path(
-            PurePath(config.theme._vars.get("custom_dir", ".")) / PurePath("sitemap.xml")
+            PurePath(config.theme.get("custom_dir", ".")) / PurePath("sitemap.xml")
         ).exists():
             custom_i18n_sitemap_dir = Path(
                 PurePath(installation_path).parent / PurePath("custom_i18n_sitemap")
@@ -180,7 +180,7 @@ def reset_to_original_config(self, config: MkDocsConfig):
         for config_key, config_value in self.original_configs.items():
             config[config_key] = config_value
         for config_key, config_value in self.original_theme_configs.items():
-            config.theme._vars[config_key] = config_value
+            config.theme[config_key] = config_value
 
         return config
 
@@ -269,24 +269,24 @@ def dict_recursive_update(source, overrides):
             return source
 
         for key, value in options.items():
-            if key in theme._vars and type(theme._vars[key]) == type(value):
-                self.save_original_config(self.original_theme_configs, key, theme._vars[key])
+            if key in theme and type(theme[key]) is type(value):
+                self.save_original_config(self.original_theme_configs, key, theme[key])
                 log.info(
                     f"Overriding '{self.current_language}' config 'theme.{key}' with '{value}'"
                 )
                 if isinstance(value, dict):
-                    dict_recursive_update(theme._vars[key], value)
+                    dict_recursive_update(theme[key], value)
                 elif isinstance(value, list):
                     for idx, item in enumerate(value):
                         if isinstance(item, dict):
-                            dict_recursive_update(theme._vars[key][idx], item)
+                            dict_recursive_update(theme[key][idx], item)
                         else:
-                            theme._vars[key][idx] = item
+                            theme[key][idx] = item
                 else:
-                    theme._vars[key] = value
+                    theme[key] = value
             elif key == "locale":
-                self.save_original_config(self.original_theme_configs, key, theme._vars[key])
-                theme._vars[key] = localization.parse_locale(value)
+                self.save_original_config(self.original_theme_configs, key, theme[key])
+                theme[key] = localization.parse_locale(value)
                 log.info(
                     f"Overriding '{self.current_language}' config 'theme.{key}' with '{value}'"
                 )
@@ -296,13 +296,13 @@ def dict_recursive_update(source, overrides):
 
     def reconfigure_mkdocs_theme(self, config: MkDocsConfig, locale: str) -> Theme:
         # set theme locale
-        if "locale" in config.theme._vars:
-            config.theme._vars["locale"] = localization.parse_locale(locale)
+        if "locale" in config.theme:
+            config.theme["locale"] = localization.parse_locale(locale)
 
     def reconfigure_material_theme(self, config: MkDocsConfig, locale: str) -> MkDocsConfig:
         # set theme language
-        if "language" in config.theme._vars:
-            config.theme._vars["language"] = locale
+        if "language" in config.theme:
+            config.theme["language"] = locale
         # configure extra.alternate language switcher
         if len(self.build_languages) > 1 or "null" in self.all_languages:
             # 'on_page_context' overrides the config.extra.alternate

diff --git a/pyproject.toml b/pyproject.toml
@@ -97,7 +97,7 @@ dependencies = [
 check = [
     "isort --check-only --diff mkdocs_static_i18n",
     "black -q --check --diff mkdocs_static_i18n",
-    "ruff mkdocs_static_i18n",
+    "ruff check mkdocs_static_i18n",
 ]
 format = [
     "isort -q mkdocs_static_i18n",
@@ -115,4 +115,6 @@ line_length = 100
 
 [tool.ruff]
 line-length = 100
+
+[tool.ruff.lint]
 ignore = ["E501"]