Fix for Python client upload list of files Issue #2036

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

@@ -1411,6 +1411,8 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
                 } else if (param instanceof FormParameter) {
                     if ("file".equalsIgnoreCase(((FormParameter) param).getType())) {
                         p.isFile = true;
+                    } else if("file".equals(p.baseType)){
+                    	p.isFile = true;
                     } else {
                         p.notFile = true;
                     }

modules/swagger-codegen/src/main/resources/python/api.mustache

@@ -117,11 +117,11 @@ class {{classname}}(object):
             header_params['{{baseName}}'] = params['{{paramName}}']
 {{/headerParams}}
 
-        form_params = {}
+        form_params = []
         files = {}
 {{#formParams}}
         if '{{paramName}}' in params:
-            {{#notFile}}form_params['{{baseName}}'] = params['{{paramName}}']{{/notFile}}{{#isFile}}files['{{baseName}}'] = params['{{paramName}}']{{/isFile}}
+            {{#notFile}}form_params.append(('{{baseName}}', params['{{paramName}}'])){{/notFile}}{{#isFile}}files['{{baseName}}'] = params['{{paramName}}']{{/isFile}}
 {{/formParams}}
 
         body_params = None

modules/swagger-codegen/src/main/resources/python/api_client.mustache

@@ -386,22 +386,23 @@ class ApiClient(object):
         :param files: File parameters.
         :return: Form parameters with files.
         """
-        params = {}
+        params = []
 
         if post_params:
-            params.update(post_params)
+            params = post_params
 
         if files:
             for k, v in iteritems(files):
                 if not v:
                     continue
-
-                with open(v, 'rb') as f:
-                    filename = os.path.basename(f.name)
-                    filedata = f.read()
-                    mimetype = mimetypes.\
-                        guess_type(filename)[0] or 'application/octet-stream'
-                    params[k] = tuple([filename, filedata, mimetype])
+                file_names = v if type(v) is list else [v]
+                for n in file_names:
+                    with open(n, 'rb') as f:
+                        filename = os.path.basename(f.name)
+                        filedata = f.read()
+                        mimetype = mimetypes.\
+                            guess_type(filename)[0] or 'application/octet-stream'
+                        params.append(tuple([k, tuple([filename, filedata, mimetype])]))
 
         return params
 

samples/client/petstore/python/swagger_client/__init__.py

@@ -9,8 +9,8 @@
 
 # import apis into sdk package
 from .apis.user_api import UserApi
-from .apis.pet_api import PetApi
 from .apis.store_api import StoreApi
+from .apis.pet_api import PetApi
 
 # import ApiClient
 from .api_client import ApiClient

samples/client/petstore/python/swagger_client/api_client.py

@@ -386,22 +386,23 @@ def prepare_post_parameters(self, post_params=None, files=None):
         :param files: File parameters.
         :return: Form parameters with files.
         """
-        params = {}
+        params = []
 
         if post_params:
-            params.update(post_params)
+            params = post_params
 
         if files:
             for k, v in iteritems(files):
                 if not v:
                     continue
-
-                with open(v, 'rb') as f:
-                    filename = os.path.basename(f.name)
-                    filedata = f.read()
-                    mimetype = mimetypes.\
-                        guess_type(filename)[0] or 'application/octet-stream'
-                    params[k] = tuple([filename, filedata, mimetype])
+                all_files = v if type(v) is list else [v]
+                for n in all_files:
+                    with open(n, 'rb') as f:
+                        filename = os.path.basename(f.name)
+                        filedata = f.read()
+                        mimetype = mimetypes.\
+                            guess_type(filename)[0] or 'application/octet-stream'
+                        params.append(tuple([k, tuple([filename, filedata, mimetype])]))
 
         return params
 

samples/client/petstore/python/swagger_client/apis/__init__.py

@@ -2,5 +2,5 @@
 
 # import apis into api package
 from .user_api import UserApi
-from .pet_api import PetApi
 from .store_api import StoreApi
+from .pet_api import PetApi

samples/client/petstore/python/swagger_client/apis/pet_api.py

@@ -89,7 +89,7 @@ def update_pet(self, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -165,7 +165,7 @@ def add_pet(self, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -243,7 +243,7 @@ def find_pets_by_status(self, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -319,7 +319,7 @@ def find_pets_by_tags(self, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -398,7 +398,7 @@ def get_pet_by_id(self, pet_id, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -479,12 +479,12 @@ def update_pet_with_form(self, pet_id, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
         if 'name' in params:
-            form_params['name'] = params['name']
+            form_params.append(('name', params['name']))
         if 'status' in params:
-            form_params['status'] = params['status']
+            form_params.append(('status', params['status']))
 
         body_params = None
 
@@ -565,7 +565,7 @@ def delete_pet(self, pet_id, **kwargs):
         if 'api_key' in params:
             header_params['api_key'] = params['api_key']
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -646,10 +646,10 @@ def upload_file(self, pet_id, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
         if 'additional_metadata' in params:
-            form_params['additionalMetadata'] = params['additional_metadata']
+            form_params.append(('additionalMetadata', params['additional_metadata']))
         if 'file' in params:
             files['file'] = params['file']
 
@@ -696,7 +696,7 @@ def get_pet_by_id_with_byte_array(self, pet_id, **kwargs):
         :param callback function: The callback function
             for asynchronous request. (optional)
         :param int pet_id: ID of pet that needs to be fetched (required)
-        :return: Binary
+        :return: str
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -729,7 +729,7 @@ def get_pet_by_id_with_byte_array(self, pet_id, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -754,7 +754,7 @@ def get_pet_by_id_with_byte_array(self, pet_id, **kwargs):
                                             body=body_params,
                                             post_params=form_params,
                                             files=files,
-                                            response_type='Binary',
+                                            response_type='str',
                                             auth_settings=auth_settings,
                                             callback=params.get('callback'))
         return response
@@ -774,7 +774,7 @@ def add_pet_using_byte_array(self, **kwargs):
 
         :param callback function: The callback function
             for asynchronous request. (optional)
-        :param Binary body: Pet object in the form of byte array
+        :param str body: Pet object in the form of byte array
         :return: None
                  If the method is called asynchronously,
                  returns the request thread.
@@ -803,7 +803,7 @@ def add_pet_using_byte_array(self, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None

samples/client/petstore/python/swagger_client/apis/store_api.py

@@ -88,7 +88,7 @@ def get_inventory(self, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -162,7 +162,7 @@ def place_order(self, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -243,7 +243,7 @@ def get_order_by_id(self, order_id, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -322,7 +322,7 @@ def delete_order(self, order_id, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None

samples/client/petstore/python/swagger_client/apis/user_api.py

@@ -89,7 +89,7 @@ def create_user(self, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -165,7 +165,7 @@ def create_users_with_array_input(self, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -241,7 +241,7 @@ def create_users_with_list_input(self, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -322,7 +322,7 @@ def login_user(self, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -395,7 +395,7 @@ def logout_user(self, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -474,7 +474,7 @@ def get_user_by_name(self, username, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -554,7 +554,7 @@ def update_user(self, username, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None
@@ -635,7 +635,7 @@ def delete_user(self, username, **kwargs):
 
         header_params = {}
 
-        form_params = {}
+        form_params = []
         files = {}
 
         body_params = None