chore: rename variable to avoid confusion with type

Author: gadenbuie

scripts/_functions_sass.R

@@ -398,11 +398,11 @@ ShinyThemePreset = Literal[
 %s
 ]
 
-ShinyThemePresets: tuple[ShinyThemePreset, ...] = (
+shiny_theme_presets: tuple[ShinyThemePreset, ...] = (
 %s
 )
 
-ShinyThemePresetsBundled: tuple[ShinyThemePreset, ...] = (
+shiny_theme_presets_bundled: tuple[ShinyThemePreset, ...] = (
 %s
 ))"
 

shiny/ui/_theme.py

@@ -13,8 +13,8 @@
 from .._versions import bootstrap
 from ._theme_presets import (
     ShinyThemePreset,
-    ShinyThemePresets,
-    ShinyThemePresetsBundled,
+    shiny_theme_presets,
+    shiny_theme_presets_bundled,
 )
 from ._utils import path_pkg_www
 
@@ -80,7 +80,7 @@ def __init__(
         # 1. "precompiled" indicating it's okay to use precompiled preset.min.css
         # 2. "" indicating that the CSS has not been compiled yet
         # 3. A string containing the compiled CSS for the current theme
-        self._css: str = "precompiled" if preset in ShinyThemePresetsBundled else ""
+        self._css: str = "precompiled" if preset in shiny_theme_presets_bundled else ""
 
         # If the theme has been customized and rendered once, we store the tempdir
         # so that we can re-use the already compiled CSS file.
@@ -91,7 +91,7 @@ def available_presets(cls) -> tuple[ShinyThemePreset, ...]:
         """
         Get a list of available theme presets.
         """
-        return ShinyThemePresets
+        return shiny_theme_presets
 
     @property
     def preset(self) -> ShinyThemePreset:
@@ -112,7 +112,7 @@ def preset(self, value: ShinyThemePreset) -> None:
         if has_customizations:
             self._css = ""
         else:
-            self._css = "precompiled" if value in ShinyThemePresetsBundled else ""
+            self._css = "precompiled" if value in shiny_theme_presets_bundled else ""
 
         self._css_temp_srcdir = None
 
@@ -347,10 +347,10 @@ def path_pkg_preset(preset: ShinyThemePreset, *args: str) -> str:
 
 
 def check_is_valid_preset(preset: ShinyThemePreset) -> None:
-    if preset not in ShinyThemePresets:
+    if preset not in shiny_theme_presets:
         raise ValueError(
             f"Invalid preset '{preset}'.\n"
-            + f"""Expected one of: "{'", "'.join(ShinyThemePresets)}".""",
+            + f"""Expected one of: "{'", "'.join(shiny_theme_presets)}".""",
         )
 
 

shiny/ui/_theme_presets.py

@@ -34,7 +34,7 @@
     "zephyr",
 ]
 
-ShinyThemePresets: tuple[ShinyThemePreset, ...] = (
+shiny_theme_presets: tuple[ShinyThemePreset, ...] = (
     "bootstrap",
     "shiny",
     "cerulean",
@@ -64,7 +64,7 @@
     "zephyr",
 )
 
-ShinyThemePresetsBundled: tuple[ShinyThemePreset, ...] = (
+shiny_theme_presets_bundled: tuple[ShinyThemePreset, ...] = (
     "bootstrap",
     "shiny",
 )

tests/pytest/test_theme.py

@@ -3,8 +3,8 @@
 from shiny.ui import Theme
 from shiny.ui._theme import (
     ShinyThemePreset,
-    ShinyThemePresets,
-    ShinyThemePresetsBundled,
+    shiny_theme_presets,
+    shiny_theme_presets_bundled,
 )
 
 
@@ -64,10 +64,10 @@ def test_theme_preset_must_be_valid():
         Theme("not_a_valid_preset")  # type: ignore
 
 
-@pytest.mark.parametrize("preset", ShinyThemePresets)
+@pytest.mark.parametrize("preset", shiny_theme_presets)
 def test_theme_css_compiles_and_is_cached(preset: ShinyThemePreset):
     theme = Theme(preset)
-    if preset in ShinyThemePresetsBundled:
+    if preset in shiny_theme_presets_bundled:
         assert theme._css == "precompiled"
     else:
         assert theme._css == ""
@@ -92,18 +92,18 @@ def test_theme_css_compiles_and_is_cached(preset: ShinyThemePreset):
 def test_theme_update_preset():
     theme = Theme("shiny")
     assert theme._preset == "shiny"
-    assert theme._css == "precompiled" if "shiny" in ShinyThemePresetsBundled else ""
+    assert theme._css == "precompiled" if "shiny" in shiny_theme_presets_bundled else ""
 
     theme.preset = "bootstrap"
     assert theme._preset == "bootstrap"
     assert theme._css == (
-        "precompiled" if "bootstrap" in ShinyThemePresetsBundled else ""
+        "precompiled" if "bootstrap" in shiny_theme_presets_bundled else ""
     )
 
     theme.preset = "sketchy"
     assert theme._preset == "sketchy"
     assert theme._css == (
-        "precompiled" if "sketchy" in ShinyThemePresetsBundled else ""
+        "precompiled" if "sketchy" in shiny_theme_presets_bundled else ""
     )
 
     with pytest.raises(ValueError, match="Invalid preset"):