[Python] add hasConsumes/hasProduces to Python API template (#4419)

* add hasConsumes/hasProduces to python api template * remove unused code in python * fix isFile in the api doc (python)
swagger-api · Dec 18, 2016 · 8ccf982 · 8ccf982
1 parent 7e67307
commit 8ccf982
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 138 deletions.
diff --git a/modules/swagger-codegen/src/main/resources/python/api.mustache b/modules/swagger-codegen/src/main/resources/python/api.mustache
@@ -196,17 +196,18 @@ class {{classname}}(object):
         if '{{paramName}}' in params:
             body_params = params['{{paramName}}']
 {{/bodyParam}}
-
+        {{#hasProduces}}
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept([{{#produces}}'{{{mediaType}}}'{{#hasMore}}, {{/hasMore}}{{/produces}}])
-        if not header_params['Accept']:
-            del header_params['Accept']
 
+        {{/hasProduces}}
+        {{#hasConsumes}}
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\
             select_header_content_type([{{#consumes}}'{{{mediaType}}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}])
 
+        {{/hasConsumes}}
         # Authentication setting
         auth_settings = [{{#authMethods}}'{{name}}'{{#hasMore}}, {{/hasMore}}{{/authMethods}}]
 

diff --git a/modules/swagger-codegen/src/main/resources/python/api_doc.mustache b/modules/swagger-codegen/src/main/resources/python/api_doc.mustache
@@ -53,7 +53,7 @@ except ApiException as e:
 {{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
-{{#allParams}} **{{paramName}}** | {{#isFile}}**{{dataType}}**{{/isFile}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{#allParams}} **{{paramName}}** | {{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{baseType}}.md){{/isPrimitiveType}}{{/isFile}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
 {{/allParams}}
 
 ### Return type

diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
@@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https://
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build package: class io.swagger.codegen.languages.PythonClientCodegen
+- Build package: io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 

diff --git a/samples/client/petstore/python/docs/FakeApi.md b/samples/client/petstore/python/docs/FakeApi.md
@@ -14,6 +14,8 @@ Method | HTTP request | Description
 
 To test \"client\" model
 
+To test \"client\" model
+
 ### Example 
 ```python
 from __future__ import print_statement
@@ -137,6 +139,8 @@ void (empty response body)
 
 To test enum parameters
 
+To test enum parameters
+
 ### Example 
 ```python
 from __future__ import print_statement

diff --git a/samples/client/petstore/python/petstore_api/apis/fake_api.py b/samples/client/petstore/python/petstore_api/apis/fake_api.py
@@ -43,6 +43,7 @@ def __init__(self, api_client=None):
     def test_client_model(self, body, **kwargs):
         """
         To test \"client\" model
+        To test \"client\" model
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please define a `callback` function
         to be invoked when receiving the response.
@@ -68,6 +69,7 @@ def test_client_model(self, body, **kwargs):
     def test_client_model_with_http_info(self, body, **kwargs):
         """
         To test \"client\" model
+        To test \"client\" model
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please define a `callback` function
         to be invoked when receiving the response.
@@ -119,12 +121,9 @@ def test_client_model_with_http_info(self, body, **kwargs):
         body_params = None
         if 'body' in params:
             body_params = params['body']
-
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept(['application/json'])
-        if not header_params['Accept']:
-            del header_params['Accept']
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\
@@ -316,12 +315,9 @@ def test_endpoint_parameters_with_http_info(self, number, double, pattern_withou
             form_params.append(('callback', params['param_callback']))
 
         body_params = None
-
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept(['application/xml; charset=utf-8', 'application/json; charset=utf-8'])
-        if not header_params['Accept']:
-            del header_params['Accept']
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\
@@ -348,6 +344,7 @@ def test_endpoint_parameters_with_http_info(self, number, double, pattern_withou
     def test_enum_parameters(self, **kwargs):
         """
         To test enum parameters
+        To test enum parameters
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please define a `callback` function
         to be invoked when receiving the response.
@@ -380,6 +377,7 @@ def test_enum_parameters(self, **kwargs):
     def test_enum_parameters_with_http_info(self, **kwargs):
         """
         To test enum parameters
+        To test enum parameters
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please define a `callback` function
         to be invoked when receiving the response.
@@ -452,12 +450,9 @@ def test_enum_parameters_with_http_info(self, **kwargs):
             form_params.append(('enum_query_double', params['enum_query_double']))
 
         body_params = None
-
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept(['*/*'])
-        if not header_params['Accept']:
-            del header_params['Accept']
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\

diff --git a/samples/client/petstore/python/petstore_api/apis/pet_api.py b/samples/client/petstore/python/petstore_api/apis/pet_api.py
@@ -121,12 +121,9 @@ def add_pet_with_http_info(self, body, **kwargs):
         body_params = None
         if 'body' in params:
             body_params = params['body']
-
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept(['application/xml', 'application/json'])
-        if not header_params['Accept']:
-            del header_params['Accept']
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\
@@ -235,16 +232,9 @@ def delete_pet_with_http_info(self, pet_id, **kwargs):
         local_var_files = {}
 
         body_params = None
-
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept(['application/xml', 'application/json'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
 
         # Authentication setting
         auth_settings = ['petstore_auth']
@@ -346,16 +336,9 @@ def find_pets_by_status_with_http_info(self, status, **kwargs):
         local_var_files = {}
 
         body_params = None
-
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept(['application/xml', 'application/json'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
 
         # Authentication setting
         auth_settings = ['petstore_auth']
@@ -457,16 +440,9 @@ def find_pets_by_tags_with_http_info(self, tags, **kwargs):
         local_var_files = {}
 
         body_params = None
-
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept(['application/xml', 'application/json'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
 
         # Authentication setting
         auth_settings = ['petstore_auth']
@@ -567,16 +543,9 @@ def get_pet_by_id_with_http_info(self, pet_id, **kwargs):
         local_var_files = {}
 
         body_params = None
-
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept(['application/xml', 'application/json'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
 
         # Authentication setting
         auth_settings = ['api_key']
@@ -677,12 +646,9 @@ def update_pet_with_http_info(self, body, **kwargs):
         body_params = None
         if 'body' in params:
             body_params = params['body']
-
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept(['application/xml', 'application/json'])
-        if not header_params['Accept']:
-            del header_params['Accept']
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\
@@ -795,12 +761,9 @@ def update_pet_with_form_with_http_info(self, pet_id, **kwargs):
             form_params.append(('status', params['status']))
 
         body_params = None
-
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept(['application/xml', 'application/json'])
-        if not header_params['Accept']:
-            del header_params['Accept']
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\
@@ -913,12 +876,9 @@ def upload_file_with_http_info(self, pet_id, **kwargs):
             local_var_files['file'] = params['file']
 
         body_params = None
-
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept(['application/json'])
-        if not header_params['Accept']:
-            del header_params['Accept']
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\

diff --git a/samples/client/petstore/python/petstore_api/apis/store_api.py b/samples/client/petstore/python/petstore_api/apis/store_api.py
@@ -123,16 +123,9 @@ def delete_order_with_http_info(self, order_id, **kwargs):
         local_var_files = {}
 
         body_params = None
-
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept(['application/xml', 'application/json'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
 
         # Authentication setting
         auth_settings = []
@@ -225,16 +218,9 @@ def get_inventory_with_http_info(self, **kwargs):
         local_var_files = {}
 
         body_params = None
-
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept(['application/json'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
 
         # Authentication setting
         auth_settings = ['api_key']
@@ -339,16 +325,9 @@ def get_order_by_id_with_http_info(self, order_id, **kwargs):
         local_var_files = {}
 
         body_params = None
-
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept(['application/xml', 'application/json'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
 
         # Authentication setting
         auth_settings = []
@@ -449,16 +428,9 @@ def place_order_with_http_info(self, body, **kwargs):
         body_params = None
         if 'body' in params:
             body_params = params['body']
-
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.\
             select_header_accept(['application/xml', 'application/json'])
-        if not header_params['Accept']:
-            del header_params['Accept']
-
-        # HTTP header `Content-Type`
-        header_params['Content-Type'] = self.api_client.\
-            select_header_content_type([])
 
         # Authentication setting
         auth_settings = []