Fallback for modern Python syntax

Author: codingjoe

health_check/contrib/atlassian.py

@@ -123,19 +123,24 @@ class GitHub(AtlassianStatusPage):
 
     """
 
-    class EnterpriseRegion(enum.StrEnum):
-        """GitHub Enterprise status page regions."""
-
-        australia = "au"
-        """Australia."""
-        eu = "eu"
-        """Europe."""
-        japan = "jp"
-        """Japan."""
-        us = "us"
-        """United States."""
-
-    enterprise_region: EnterpriseRegion | None = None
+    try:
+
+        class EnterpriseRegion(enum.StrEnum):
+            """GitHub Enterprise status page regions."""
+
+            australia = "au"
+            """Australia."""
+            eu = "eu"
+            """Europe."""
+            japan = "jp"
+            """Japan."""
+            us = "us"
+            """United States."""
+
+        enterprise_region: EnterpriseRegion | None = None
+    except AttributeError:
+        # Python <3.11 doesn't have StrEnum, so fall back to a simple string field with validation
+        enterprise_region: str | None = None
     timeout: datetime.timedelta = dataclasses.field(
         default=datetime.timedelta(seconds=10), repr=False
     )

health_check/contrib/celery.py

@@ -3,7 +3,6 @@
 import dataclasses
 import datetime
 import typing
-from types import MappingProxyType
 
 import celery
 from celery.app import app_or_default
@@ -26,9 +25,7 @@ class Ping(HealthCheck):
 
     """
 
-    CORRECT_PING_RESPONSE: typing.Final[dict[str, str]] = MappingProxyType(
-        {"ok": "pong"}
-    )
+    CORRECT_PING_RESPONSE: typing.ClassVar[dict[str, str]] = {"ok": "pong"}
     app: celery.Celery = dataclasses.field(default_factory=app_or_default)
     timeout: datetime.timedelta = dataclasses.field(
         default=datetime.timedelta(seconds=1), repr=False

health_check/contrib/rss.py

@@ -89,17 +89,15 @@ async def run(self):
             logger.debug("No entries found in feed")
             return
 
-        incidents = [entry for entry in feed.entries if self._is_recent_incident(entry)]
-
-        if incidents:
+        if incidents := [
+            entry for entry in feed.entries if self._is_recent_incident(entry)
+        ]:
             raise ServiceWarning(
-                f"Found {len(incidents)} recent incident(s): {
-                    ', '.join(
-                        getattr(entry, 'title', 'Untitled incident')
-                        or 'Untitled incident'
-                        for entry in incidents
-                    )
-                }"
+                "\n".join(
+                    f"{getattr(entry, 'title', 'Unknown Incident') or 'Unknown Incident'}:"
+                    f" {getattr(entry, 'link', self.feed_url) or self.feed_url}"
+                    for entry in incidents
+                )
             )
 
         logger.debug("No recent incidents found in feed")

tests/contrib/test_atlassian.py

@@ -234,9 +234,7 @@ async def test_check_status__ok(self):
     def test_base_url_format(self):
         """Verify correct base URL for GitHub."""
         assert GitHub().base_url == "https://www.githubstatus.com"
-        assert (
-            GitHub(GitHub.EnterpriseRegion.eu).base_url == "https://eu.githubstatus.com"
-        )
+        assert GitHub("eu").base_url == "https://eu.githubstatus.com"
 
 
 class TestCloudflare:

tests/contrib/test_rss.py

@@ -58,7 +58,6 @@ async def test_check_status__detects_any_entry_as_incident(self):
                 result = await check.get_result()
                 assert result.error is not None
                 assert isinstance(result.error, ServiceWarning)
-                assert "1 recent incident(s)" in str(result.error)
                 assert "Service is operating normally" in str(result.error)
 
     @pytest.mark.asyncio
@@ -103,7 +102,7 @@ async def test_check_status__multiple_incidents(self):
                 result = await check.get_result()
                 assert result.error is not None
                 assert isinstance(result.error, ServiceWarning)
-                assert "2 recent incident(s)" in str(result.error)
+                assert "\n" in str(result.error)
 
     @pytest.mark.asyncio
     async def test_check_status__no_recent_incidents(self):
@@ -327,7 +326,7 @@ async def test_extract_title__entry_without_title(self):
                 result = await check.get_result()
                 assert result.error is not None
                 assert isinstance(result.error, ServiceWarning)
-                assert "Untitled incident" in str(result.error)
+                assert "Unknown Incident" in str(result.error)
 
     def test_feed_url_format(self):
         """Verify correct feed URL format for AWS."""
@@ -796,7 +795,7 @@ async def test_check_status__atom_entry_with_empty_title(self):
                 result = await check.get_result()
                 assert result.error is not None
                 assert isinstance(result.error, ServiceWarning)
-                assert "Untitled incident" in str(result.error)
+                assert "Unknown Incident:" in str(result.error)
 
     @pytest.mark.asyncio
     async def test_check_status__atom_entry_without_title(self):
@@ -833,4 +832,4 @@ async def test_check_status__atom_entry_without_title(self):
                 result = await check.get_result()
                 assert result.error is not None
                 assert isinstance(result.error, ServiceWarning)
-                assert "Untitled incident" in str(result.error)
+                assert "Unknown Incident:" in str(result.error)