Merge pull request #3061 from taxpon/issue-3055

[Python] Fix bug of test files about packageName

Author: wing328

bin/python-petstore.sh

@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/python -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l python -o samples/client/petstore/python"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/python -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l python -o samples/client/petstore/python -DpackageName=petstore_api"
 
 java $JAVA_OPTS -jar $executable $ags

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

@@ -8,16 +8,16 @@ import os
 import sys
 import unittest
 
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.apis.{{classVarName}} import {{classname}}
+import {{packageName}}
+from {{packageName}}.rest import ApiException
+from {{packageName}}.apis.{{classVarName}} import {{classname}}
 
 
 class {{#operations}}Test{{classname}}(unittest.TestCase):
     """ {{classname}} unit test stubs """
 
     def setUp(self):
-        self.api = swagger_client.apis.{{classVarName}}.{{classname}}()
+        self.api = {{packageName}}.apis.{{classVarName}}.{{classname}}()
 
     def tearDown(self):
         pass

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

@@ -10,9 +10,9 @@ import unittest
 
 {{#models}}
 {{#model}}
-import swagger_client
-from swagger_client.rest import ApiException
-from swagger_client.models.{{classFilename}} import {{classname}}
+import {{packageName}}
+from {{packageName}}.rest import ApiException
+from {{packageName}}.models.{{classFilename}} import {{classname}}
 
 
 class Test{{classname}}(unittest.TestCase):
@@ -28,7 +28,7 @@ class Test{{classname}}(unittest.TestCase):
         """
         Test {{classname}}
         """
-        model = swagger_client.models.{{classFilename}}.{{classname}}()
+        model = {{packageName}}.models.{{classFilename}}.{{classname}}()
 
 {{/model}}
 {{/models}}

samples/client/petstore/python/.gitignore

@@ -44,6 +44,8 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
+venv/
+.python-version
 
 # Translations
 *.mo

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 date: 2016-06-07T08:27:42.099+09:00
+- Build date: 2016-06-07T00:29:52.148+09:00
 - Build package: class io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.

samples/client/petstore/python/docs/FakeApi.md

@@ -1,4 +1,4 @@
-# swagger_client.FakeApi
+# petstore_api.FakeApi
 
 All URIs are relative to *http://petstore.swagger.io/v2*
 
@@ -17,12 +17,12 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.FakeApi()
+api_instance = petstore_api.FakeApi()
 number = 3.4 # float | None
 double = 1.2 # float | None
 string = 'string_example' # str | None

samples/client/petstore/python/docs/PetApi.md

@@ -1,4 +1,4 @@
-# swagger_client.PetApi
+# petstore_api.PetApi
 
 All URIs are relative to *http://petstore.swagger.io/v2*
 
@@ -24,16 +24,16 @@ Add a new pet to the store
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
+petstore_api.configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # create an instance of the API class
-api_instance = swagger_client.PetApi()
-body = swagger_client.Pet() # Pet | Pet object that needs to be added to the store
+api_instance = petstore_api.PetApi()
+body = petstore_api.Pet() # Pet | Pet object that needs to be added to the store
 
 try: 
     # Add a new pet to the store
@@ -73,15 +73,15 @@ Deletes a pet
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
+petstore_api.configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # create an instance of the API class
-api_instance = swagger_client.PetApi()
+api_instance = petstore_api.PetApi()
 pet_id = 789 # int | Pet id to delete
 api_key = 'api_key_example' # str |  (optional)
 
@@ -124,15 +124,15 @@ Multiple status values can be provided with comma separated strings
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
+petstore_api.configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # create an instance of the API class
-api_instance = swagger_client.PetApi()
+api_instance = petstore_api.PetApi()
 status = ['status_example'] # list[str] | Status values that need to be considered for filter
 
 try: 
@@ -174,15 +174,15 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
+petstore_api.configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # create an instance of the API class
-api_instance = swagger_client.PetApi()
+api_instance = petstore_api.PetApi()
 tags = ['tags_example'] # list[str] | Tags to filter by
 
 try: 
@@ -224,17 +224,17 @@ Returns a single pet
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure API key authorization: api_key
-swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY'
+petstore_api.configuration.api_key['api_key'] = 'YOUR_API_KEY'
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# swagger_client.configuration.api_key_prefix['api_key'] = 'Bearer'
+# petstore_api.configuration.api_key_prefix['api_key'] = 'Bearer'
 
 # create an instance of the API class
-api_instance = swagger_client.PetApi()
+api_instance = petstore_api.PetApi()
 pet_id = 789 # int | ID of pet to return
 
 try: 
@@ -276,16 +276,16 @@ Update an existing pet
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
+petstore_api.configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # create an instance of the API class
-api_instance = swagger_client.PetApi()
-body = swagger_client.Pet() # Pet | Pet object that needs to be added to the store
+api_instance = petstore_api.PetApi()
+body = petstore_api.Pet() # Pet | Pet object that needs to be added to the store
 
 try: 
     # Update an existing pet
@@ -325,15 +325,15 @@ Updates a pet in the store with form data
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
+petstore_api.configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # create an instance of the API class
-api_instance = swagger_client.PetApi()
+api_instance = petstore_api.PetApi()
 pet_id = 789 # int | ID of pet that needs to be updated
 name = 'name_example' # str | Updated name of the pet (optional)
 status = 'status_example' # str | Updated status of the pet (optional)
@@ -378,15 +378,15 @@ uploads an image
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure OAuth2 access token for authorization: petstore_auth
-swagger_client.configuration.access_token = 'YOUR_ACCESS_TOKEN'
+petstore_api.configuration.access_token = 'YOUR_ACCESS_TOKEN'
 
 # create an instance of the API class
-api_instance = swagger_client.PetApi()
+api_instance = petstore_api.PetApi()
 pet_id = 789 # int | ID of pet to update
 additional_metadata = 'additional_metadata_example' # str | Additional data to pass to server (optional)
 file = '/path/to/file.txt' # file | file to upload (optional)

samples/client/petstore/python/docs/StoreApi.md

@@ -1,4 +1,4 @@
-# swagger_client.StoreApi
+# petstore_api.StoreApi
 
 All URIs are relative to *http://petstore.swagger.io/v2*
 
@@ -20,12 +20,12 @@ For valid response try integer IDs with value < 1000. Anything above 1000 or non
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.StoreApi()
+api_instance = petstore_api.StoreApi()
 order_id = 'order_id_example' # str | ID of the order that needs to be deleted
 
 try: 
@@ -66,17 +66,17 @@ Returns a map of status codes to quantities
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # Configure API key authorization: api_key
-swagger_client.configuration.api_key['api_key'] = 'YOUR_API_KEY'
+petstore_api.configuration.api_key['api_key'] = 'YOUR_API_KEY'
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-# swagger_client.configuration.api_key_prefix['api_key'] = 'Bearer'
+# petstore_api.configuration.api_key_prefix['api_key'] = 'Bearer'
 
 # create an instance of the API class
-api_instance = swagger_client.StoreApi()
+api_instance = petstore_api.StoreApi()
 
 try: 
     # Returns pet inventories by status
@@ -114,12 +114,12 @@ For valid response try integer IDs with value <= 5 or > 10. Other values will ge
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.StoreApi()
+api_instance = petstore_api.StoreApi()
 order_id = 789 # int | ID of pet that needs to be fetched
 
 try: 
@@ -161,13 +161,13 @@ Place an order for a pet
 ### Example 
 ```python
 import time
-import swagger_client
-from swagger_client.rest import ApiException
+import petstore_api
+from petstore_api.rest import ApiException
 from pprint import pprint
 
 # create an instance of the API class
-api_instance = swagger_client.StoreApi()
-body = swagger_client.Order() # Order | order placed for purchasing the pet
+api_instance = petstore_api.StoreApi()
+body = petstore_api.Order() # Order | order placed for purchasing the pet
 
 try: 
     # Place an order for a pet