Remove trailing comma in endpoint_macros.pyi (#178)

* Fixes #179

Author: dtkav

CHANGELOG.md

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## 0.5.5 - Unreleased
+### Fixes
+- Improved trailing comma handling in endpoint generation (#178 & #179). Thanks @dtkav!
+
+
 ## 0.5.4 - 2020-08-29
 ### Additions
 - Support for octet-stream content type (#116)

end_to_end_tests/golden-master/my_test_api_client/api/tests.py

@@ -14,9 +14,7 @@
 
 def get_user_list(
     *, client: Client, an_enum_value: List[AnEnum], some_date: Union[datetime.date, datetime.datetime],
-) -> Union[
-    List[AModel], HTTPValidationError,
-]:
+) -> Union[List[AModel], HTTPValidationError]:
 
     """ Get a list of things  """
     url = "{}/tests/".format(client.base_url)
@@ -112,9 +110,7 @@ def get_basic_list_of_booleans(*, client: Client,) -> List[bool]:
 
 def upload_file_tests_upload_post(
     *, client: Client, multipart_data: BodyUploadFileTestsUploadPost, keep_alive: Optional[bool] = None,
-) -> Union[
-    None, HTTPValidationError,
-]:
+) -> Union[None, HTTPValidationError]:
 
     """ Upload a file  """
     url = "{}/tests/upload".format(client.base_url)
@@ -133,11 +129,7 @@ def upload_file_tests_upload_post(
         raise ApiResponseError(response=response)
 
 
-def json_body_tests_json_body_post(
-    *, client: Client, json_body: AModel,
-) -> Union[
-    None, HTTPValidationError,
-]:
+def json_body_tests_json_body_post(*, client: Client, json_body: AModel,) -> Union[None, HTTPValidationError]:
 
     """ Try sending a JSON body  """
     url = "{}/tests/json_body".format(client.base_url)
@@ -171,9 +163,7 @@ def test_defaults_tests_test_defaults_post(
     ),
     union_prop: Optional[Union[Optional[float], Optional[str]]] = "not a float",
     enum_prop: Optional[AnEnum] = None,
-) -> Union[
-    None, HTTPValidationError,
-]:
+) -> Union[None, HTTPValidationError]:
 
     """  """
     url = "{}/tests/test_defaults".format(client.base_url)

end_to_end_tests/golden-master/my_test_api_client/async_api/tests.py

@@ -14,9 +14,7 @@
 
 async def get_user_list(
     *, client: Client, an_enum_value: List[AnEnum], some_date: Union[datetime.date, datetime.datetime],
-) -> Union[
-    List[AModel], HTTPValidationError,
-]:
+) -> Union[List[AModel], HTTPValidationError]:
 
     """ Get a list of things  """
     url = "{}/tests/".format(client.base_url,)
@@ -117,9 +115,7 @@ async def get_basic_list_of_booleans(*, client: Client,) -> List[bool]:
 
 async def upload_file_tests_upload_post(
     *, client: Client, multipart_data: BodyUploadFileTestsUploadPost, keep_alive: Optional[bool] = None,
-) -> Union[
-    None, HTTPValidationError,
-]:
+) -> Union[None, HTTPValidationError]:
 
     """ Upload a file  """
     url = "{}/tests/upload".format(client.base_url,)
@@ -139,11 +135,7 @@ async def upload_file_tests_upload_post(
         raise ApiResponseError(response=response)
 
 
-async def json_body_tests_json_body_post(
-    *, client: Client, json_body: AModel,
-) -> Union[
-    None, HTTPValidationError,
-]:
+async def json_body_tests_json_body_post(*, client: Client, json_body: AModel,) -> Union[None, HTTPValidationError]:
 
     """ Try sending a JSON body  """
     url = "{}/tests/json_body".format(client.base_url,)
@@ -178,9 +170,7 @@ async def test_defaults_tests_test_defaults_post(
     ),
     union_prop: Optional[Union[Optional[float], Optional[str]]] = "not a float",
     enum_prop: Optional[AnEnum] = None,
-) -> Union[
-    None, HTTPValidationError,
-]:
+) -> Union[None, HTTPValidationError]:
 
     """  """
     url = "{}/tests/test_defaults".format(client.base_url,)

openapi_python_client/templates/endpoint_macros.pyi

@@ -61,7 +61,7 @@ if {{ property.python_name }} is not None:
 {% else %}
 ) -> Union[
     {% for response in endpoint.responses %}
-    {{ response.return_string() }},
+    {{ response.return_string() }}{{ "," if not loop.last }}
     {% endfor %}
 ]:
 {% endif %}