Merge branch 'master' into html2_Auth

Author: gracekarina

src/main/java/io/swagger/codegen/v3/generators/python/PythonClientCodegen.java

@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static io.swagger.codegen.v3.generators.handlebars.ExtensionHelper.getBooleanValue;
 
@@ -237,8 +238,17 @@ public void processOpts() {
         modelPackage = packageName + "." + modelPackage;
         apiPackage = packageName + "." + apiPackage;
 
-        copyFistAllOfProperties = true;
+    }
 
+    @Override
+    public CodegenModel fromModel(String name, Schema schema, Map<String, Schema> allDefinitions) {
+        final CodegenModel codegenModel = super.fromModel(name, schema, allDefinitions);
+        final List<String> imports = codegenModel.imports.stream()
+                .filter(model -> model.equals(codegenModel.parent))
+                .collect(Collectors.toList());
+        codegenModel.imports.clear();
+        codegenModel.imports.addAll(imports);
+        return codegenModel;
     }
 
     private static String dropDots(String str) {

src/main/resources/handlebars/python/api_test.mustache

@@ -7,15 +7,15 @@ from __future__ import absolute_import
 import unittest
 
 import {{packageName}}
-from {{apiPackage}}.{{classVarName}} import {{classname}}  # noqa: E501
+from {{packageName}}.{{apiPackage}}.{{classVarName}} import {{classname}}  # noqa: E501
 from {{packageName}}.rest import ApiException
 
 
 class {{#operations}}Test{{classname}}(unittest.TestCase):
     """{{classname}} unit test stubs"""
 
     def setUp(self):
-        self.api = {{apiPackage}}.{{classVarName}}.{{classname}}()  # noqa: E501
+        self.api = {{classname}}()  # noqa: E501
 
     def tearDown(self):
         pass

src/main/resources/handlebars/python/model.mustache

@@ -6,11 +6,14 @@ import pprint
 import re  # noqa: F401
 
 import six
-
+{{#imports}}{{#@first}}
+{{/@first}}
+{{import}}  # noqa: F401,E501
+{{/imports}}
 
 {{#models}}
 {{#model}}
-class {{classname}}(object):
+class {{classname}}({{#parent}}{{parent}}{{/parent}}{{^parent}}object{{/parent}}):
     """NOTE: This class is auto generated by the swagger code generator program.
 
     Do not edit the class manually.

src/main/resources/handlebars/python/model_test.mustache

@@ -9,7 +9,7 @@ import unittest
 {{#models}}
 {{#model}}
 import {{packageName}}
-from {{modelPackage}}.{{classFilename}} import {{classname}}  # noqa: E501
+from {{packageName}}.{{modelPackage}}.{{classFilename}} import {{classname}}  # noqa: E501
 from {{packageName}}.rest import ApiException
 
 

src/main/resources/handlebars/python/tox.mustache

@@ -1,10 +1,5 @@
 [tox]
-{{^asyncio}}
-envlist = py27, py3
-{{/asyncio}}
-{{#asyncio}}
 envlist = py3
-{{/asyncio}}
 
 [testenv]
 deps=-r{toxinidir}/requirements.txt

src/main/resources/handlebars/python/travis.mustache

@@ -1,7 +1,6 @@
 # ref: https://docs.travis-ci.com/user/languages/python
 language: python
 python:
-  - "2.7"
   - "3.2"
   - "3.3"
   - "3.4"