Skip to content

Commit

Permalink
Merge branch 'master' into update-advanced-docs-links
Browse files Browse the repository at this point in the history
  • Loading branch information
nick2i authored Feb 28, 2024
2 parents b990b62 + 6045186 commit 67df72f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions httpx/_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ def build_request(
See also: [Request instances][0]
[0]: /advanced/#request-instances
[0]: /advanced/clients/#request-instances
"""
url = self._merge_url(url)
headers = self._merge_headers(headers)
Expand Down Expand Up @@ -812,7 +812,7 @@ def request(
[Merging of configuration][0] for how the various parameters
are merged with client-level configuration.
[0]: /advanced/#merging-of-configuration
[0]: /advanced/clients/#merging-of-configuration
"""
if cookies is not None:
message = (
Expand Down Expand Up @@ -908,7 +908,7 @@ def send(
See also: [Request instances][0]
[0]: /advanced/#request-instances
[0]: /advanced/clients/#request-instances
"""
if self._state == ClientState.CLOSED:
raise RuntimeError("Cannot send a request, as the client has been closed.")
Expand Down Expand Up @@ -1560,7 +1560,7 @@ async def request(
and [Merging of configuration][0] for how the various parameters
are merged with client-level configuration.
[0]: /advanced/#merging-of-configuration
[0]: /advanced/clients/#merging-of-configuration
"""

if cookies is not None: # pragma: no cover
Expand Down Expand Up @@ -1657,7 +1657,7 @@ async def send(
See also: [Request instances][0]
[0]: /advanced/#request-instances
[0]: /advanced/clients/#request-instances
"""
if self._state == ClientState.CLOSED:
raise RuntimeError("Cannot send a request, as the client has been closed.")
Expand Down

0 comments on commit 67df72f

Please sign in to comment.