Skip to content

Commit 749baaf

Browse files
robertschweizerrobertschweizer
committed
fix: Fix missing None in Response[] generic type
Also prevents double return type annotations like `Optional[None]`.
1 parent 4e4e1da commit 749baaf

37 files changed

+271
-269
lines changed

‎end_to_end_tests/golden-record/my_test_api_client/api/default/get_common_parameters.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, Union
2+
from typing import Any, Dict, Union
33

44
import httpx
55

@@ -34,7 +34,7 @@ def _get_kwargs(
3434
}
3535

3636

37-
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[None]:
37+
def _parse_response(*, client: Client, response: httpx.Response) -> None:
3838
if response.status_code == HTTPStatus.OK:
3939
return None
4040
if client.raise_on_unexpected_status:

‎end_to_end_tests/golden-record/my_test_api_client/api/default/post_common_parameters.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, Union
2+
from typing import Any, Dict, Union
33

44
import httpx
55

@@ -34,7 +34,7 @@ def _get_kwargs(
3434
}
3535

3636

37-
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[None]:
37+
def _parse_response(*, client: Client, response: httpx.Response) -> None:
3838
if response.status_code == HTTPStatus.OK:
3939
return None
4040
if client.raise_on_unexpected_status:

‎end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_header_types.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, Union
2+
from typing import Any, Dict, Union
33

44
import httpx
55

@@ -53,7 +53,7 @@ def _get_kwargs(
5353
}
5454

5555

56-
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[None]:
56+
def _parse_response(*, client: Client, response: httpx.Response) -> None:
5757
if response.status_code == HTTPStatus.OK:
5858
return None
5959
if client.raise_on_unexpected_status:

‎end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_query_optionality.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import datetime
22
from http import HTTPStatus
3-
from typing import Any, Dict, Optional, Union
3+
from typing import Any, Dict, Union
44

55
import httpx
66

@@ -58,7 +58,7 @@ def _get_kwargs(
5858
}
5959

6060

61-
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[None]:
61+
def _parse_response(*, client: Client, response: httpx.Response) -> None:
6262
if response.status_code == HTTPStatus.OK:
6363
return None
6464
if client.raise_on_unexpected_status:

‎end_to_end_tests/golden-record/my_test_api_client/api/parameter_references/get_parameter_references_path_param.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, Union
2+
from typing import Any, Dict, Union
33

44
import httpx
55

@@ -46,7 +46,7 @@ def _get_kwargs(
4646
}
4747

4848

49-
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[None]:
49+
def _parse_response(*, client: Client, response: httpx.Response) -> None:
5050
if response.status_code == HTTPStatus.OK:
5151
return None
5252
if client.raise_on_unexpected_status:

‎end_to_end_tests/golden-record/my_test_api_client/api/parameters/delete_common_parameters_overriding_param.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, Union
2+
from typing import Any, Dict, Union
33

44
import httpx
55

@@ -35,7 +35,7 @@ def _get_kwargs(
3535
}
3636

3737

38-
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[None]:
38+
def _parse_response(*, client: Client, response: httpx.Response) -> None:
3939
if response.status_code == HTTPStatus.OK:
4040
return None
4141
if client.raise_on_unexpected_status:

‎end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_common_parameters_overriding_param.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional
2+
from typing import Any, Dict
33

44
import httpx
55

@@ -35,7 +35,7 @@ def _get_kwargs(
3535
}
3636

3737

38-
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[None]:
38+
def _parse_response(*, client: Client, response: httpx.Response) -> None:
3939
if response.status_code == HTTPStatus.OK:
4040
return None
4141
if client.raise_on_unexpected_status:

‎end_to_end_tests/golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, Union
2+
from typing import Any, Dict, Union
33

44
import httpx
55

@@ -43,7 +43,7 @@ def _get_kwargs(
4343
}
4444

4545

46-
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[None]:
46+
def _parse_response(*, client: Client, response: httpx.Response) -> None:
4747
if response.status_code == HTTPStatus.OK:
4848
return None
4949
if client.raise_on_unexpected_status:

‎end_to_end_tests/golden-record/my_test_api_client/api/parameters/multiple_path_parameters.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional
2+
from typing import Any, Dict
33

44
import httpx
55

@@ -33,7 +33,7 @@ def _get_kwargs(
3333
}
3434

3535

36-
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[None]:
36+
def _parse_response(*, client: Client, response: httpx.Response) -> None:
3737
if response.status_code == HTTPStatus.OK:
3838
return None
3939
if client.raise_on_unexpected_status:

‎end_to_end_tests/golden-record/my_test_api_client/api/responses/post_responses_unions_simple_before_complex.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional
2+
from typing import Any, Dict, Union
33

44
import httpx
55

@@ -32,7 +32,7 @@ def _get_kwargs(
3232

3333
def _parse_response(
3434
*, client: Client, response: httpx.Response
35-
) -> Optional[PostResponsesUnionsSimpleBeforeComplexResponse200]:
35+
) -> Union[None, PostResponsesUnionsSimpleBeforeComplexResponse200]:
3636
if response.status_code == HTTPStatus.OK:
3737
response_200 = PostResponsesUnionsSimpleBeforeComplexResponse200.from_dict(response.json())
3838

@@ -45,7 +45,7 @@ def _parse_response(
4545

4646
def _build_response(
4747
*, client: Client, response: httpx.Response
48-
) -> Response[PostResponsesUnionsSimpleBeforeComplexResponse200]:
48+
) -> Response[Union[None, PostResponsesUnionsSimpleBeforeComplexResponse200]]:
4949
return Response(
5050
status_code=HTTPStatus(response.status_code),
5151
content=response.content,
@@ -57,15 +57,15 @@ def _build_response(
5757
def sync_detailed(
5858
*,
5959
client: Client,
60-
) -> Response[PostResponsesUnionsSimpleBeforeComplexResponse200]:
60+
) -> Response[Union[None, PostResponsesUnionsSimpleBeforeComplexResponse200]]:
6161
"""Regression test for #603
6262
6363
Raises:
6464
errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
6565
httpx.TimeoutException: If the request takes longer than Client.timeout.
6666
6767
Returns:
68-
Response[PostResponsesUnionsSimpleBeforeComplexResponse200]
68+
Response[Union[None, PostResponsesUnionsSimpleBeforeComplexResponse200]]
6969
"""
7070

7171
kwargs = _get_kwargs(
@@ -83,15 +83,15 @@ def sync_detailed(
8383
def sync(
8484
*,
8585
client: Client,
86-
) -> Optional[PostResponsesUnionsSimpleBeforeComplexResponse200]:
86+
) -> Union[None, PostResponsesUnionsSimpleBeforeComplexResponse200]:
8787
"""Regression test for #603
8888
8989
Raises:
9090
errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
9191
httpx.TimeoutException: If the request takes longer than Client.timeout.
9292
9393
Returns:
94-
Response[PostResponsesUnionsSimpleBeforeComplexResponse200]
94+
Response[Union[None, PostResponsesUnionsSimpleBeforeComplexResponse200]]
9595
"""
9696

9797
return sync_detailed(
@@ -102,15 +102,15 @@ def sync(
102102
async def asyncio_detailed(
103103
*,
104104
client: Client,
105-
) -> Response[PostResponsesUnionsSimpleBeforeComplexResponse200]:
105+
) -> Response[Union[None, PostResponsesUnionsSimpleBeforeComplexResponse200]]:
106106
"""Regression test for #603
107107
108108
Raises:
109109
errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
110110
httpx.TimeoutException: If the request takes longer than Client.timeout.
111111
112112
Returns:
113-
Response[PostResponsesUnionsSimpleBeforeComplexResponse200]
113+
Response[Union[None, PostResponsesUnionsSimpleBeforeComplexResponse200]]
114114
"""
115115

116116
kwargs = _get_kwargs(
@@ -126,15 +126,15 @@ async def asyncio_detailed(
126126
async def asyncio(
127127
*,
128128
client: Client,
129-
) -> Optional[PostResponsesUnionsSimpleBeforeComplexResponse200]:
129+
) -> Union[None, PostResponsesUnionsSimpleBeforeComplexResponse200]:
130130
"""Regression test for #603
131131
132132
Raises:
133133
errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
134134
httpx.TimeoutException: If the request takes longer than Client.timeout.
135135
136136
Returns:
137-
Response[PostResponsesUnionsSimpleBeforeComplexResponse200]
137+
Response[Union[None, PostResponsesUnionsSimpleBeforeComplexResponse200]]
138138
"""
139139

140140
return (

‎end_to_end_tests/golden-record/my_test_api_client/api/tag1/get_tag_with_number.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional
2+
from typing import Any, Dict
33

44
import httpx
55

@@ -27,7 +27,7 @@ def _get_kwargs(
2727
}
2828

2929

30-
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[None]:
30+
def _parse_response(*, client: Client, response: httpx.Response) -> None:
3131
if response.status_code == HTTPStatus.OK:
3232
return None
3333
if client.raise_on_unexpected_status:

‎end_to_end_tests/golden-record/my_test_api_client/api/tests/callback_test.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from http import HTTPStatus
2-
from typing import Any, Dict, Optional, Union
2+
from typing import Any, Dict, Union
33

44
import httpx
55

@@ -33,7 +33,7 @@ def _get_kwargs(
3333
}
3434

3535

36-
def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Union[Any, HTTPValidationError]]:
36+
def _parse_response(*, client: Client, response: httpx.Response) -> Union[Any, HTTPValidationError, None]:
3737
if response.status_code == HTTPStatus.OK:
3838
return response.json()
3939
if response.status_code == HTTPStatus.UNPROCESSABLE_ENTITY:
@@ -46,7 +46,7 @@ def _parse_response(*, client: Client, response: httpx.Response) -> Optional[Uni
4646
return None
4747

4848

49-
def _build_response(*, client: Client, response: httpx.Response) -> Response[Union[Any, HTTPValidationError]]:
49+
def _build_response(*, client: Client, response: httpx.Response) -> Response[Union[Any, HTTPValidationError, None]]:
5050
return Response(
5151
status_code=HTTPStatus(response.status_code),
5252
content=response.content,
@@ -59,7 +59,7 @@ def sync_detailed(
5959
*,
6060
client: Client,
6161
json_body: AModel,
62-
) -> Response[Union[Any, HTTPValidationError]]:
62+
) -> Response[Union[Any, HTTPValidationError, None]]:
6363
"""Path with callback
6464
6565
Try sending a request related to a callback
@@ -72,7 +72,7 @@ def sync_detailed(
7272
httpx.TimeoutException: If the request takes longer than Client.timeout.
7373
7474
Returns:
75-
Response[Union[Any, HTTPValidationError]]
75+
Response[Union[Any, HTTPValidationError, None]]
7676
"""
7777

7878
kwargs = _get_kwargs(
@@ -92,7 +92,7 @@ def sync(
9292
*,
9393
client: Client,
9494
json_body: AModel,
95-
) -> Optional[Union[Any, HTTPValidationError]]:
95+
) -> Union[Any, HTTPValidationError, None]:
9696
"""Path with callback
9797
9898
Try sending a request related to a callback
@@ -105,7 +105,7 @@ def sync(
105105
httpx.TimeoutException: If the request takes longer than Client.timeout.
106106
107107
Returns:
108-
Response[Union[Any, HTTPValidationError]]
108+
Response[Union[Any, HTTPValidationError, None]]
109109
"""
110110

111111
return sync_detailed(
@@ -118,7 +118,7 @@ async def asyncio_detailed(
118118
*,
119119
client: Client,
120120
json_body: AModel,
121-
) -> Response[Union[Any, HTTPValidationError]]:
121+
) -> Response[Union[Any, HTTPValidationError, None]]:
122122
"""Path with callback
123123
124124
Try sending a request related to a callback
@@ -131,7 +131,7 @@ async def asyncio_detailed(
131131
httpx.TimeoutException: If the request takes longer than Client.timeout.
132132
133133
Returns:
134-
Response[Union[Any, HTTPValidationError]]
134+
Response[Union[Any, HTTPValidationError, None]]
135135
"""
136136

137137
kwargs = _get_kwargs(
@@ -149,7 +149,7 @@ async def asyncio(
149149
*,
150150
client: Client,
151151
json_body: AModel,
152-
) -> Optional[Union[Any, HTTPValidationError]]:
152+
) -> Union[Any, HTTPValidationError, None]:
153153
"""Path with callback
154154
155155
Try sending a request related to a callback
@@ -162,7 +162,7 @@ async def asyncio(
162162
httpx.TimeoutException: If the request takes longer than Client.timeout.
163163
164164
Returns:
165-
Response[Union[Any, HTTPValidationError]]
165+
Response[Union[Any, HTTPValidationError, None]]
166166
"""
167167

168168
return (

0 commit comments

Comments
 (0)