Merge branch 'master' into release/0.42.0

encode · Dec 13, 2024 · 28fa5b4 · 28fa5b4
2 parents e137924 + 5000c9f
commit 28fa5b4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/docs/third-party-packages.md b/docs/third-party-packages.md
@@ -7,10 +7,10 @@ Here are some of those third party packages:
 
 ### Apitally
 
-<a href="https://github.com/apitally/python-client" target="_blank">GitHub</a> |
+<a href="https://github.com/apitally/apitally-py" target="_blank">GitHub</a> |
 <a href="https://docs.apitally.io/frameworks/starlette" target="_blank">Documentation</a>
 
-Simple traffic, error and response time monitoring plus API key and permission management for Starlette (and other frameworks).
+Analytics, request logging and monitoring for REST APIs built with Starlette (and other frameworks).
 
 ### Authlib
 

diff --git a/starlette/templating.py b/starlette/templating.py
@@ -98,7 +98,7 @@ def __init__(
         self.context_processors = context_processors or []
         if directory is not None:
             self.env = self._create_env(directory, **env_options)
-        elif env is not None:
+        elif env is not None:  # pragma: no branch
             self.env = env
 
         self._setup_env_defaults(self.env)

diff --git a/starlette/websockets.py b/starlette/websockets.py
@@ -103,7 +103,7 @@ async def accept(
     ) -> None:
         headers = headers or []
 
-        if self.client_state == WebSocketState.CONNECTING:
+        if self.client_state == WebSocketState.CONNECTING:  # pragma: no branch
             # If we haven't yet seen the 'connect' message, then wait for it first.
             await self.receive()
         await self.send({"type": "websocket.accept", "subprotocol": subprotocol, "headers": headers})