Merge branch 'master' into master

Author: HugoMario

src/main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptAngularClientCodegen.java

@@ -348,7 +348,7 @@ private List<Map<String, String>> toTsImports(CodegenModel cm, Set<String> impor
             if (!im.equals(cm.classname)) {
                 HashMap<String, String> tsImport = new HashMap<>();
                 tsImport.put("classname", im);
-                tsImport.put("filename", toModelFilename(im));
+                tsImport.put("filename", im);
                 tsImports.add(tsImport);
             }
         }
@@ -383,7 +383,7 @@ public String toModelFilename(String name) {
 
     @Override
     public String toModelImport(String name) {
-        return modelPackage() + "/" + toModelFilename(name);
+        return modelPackage() + "/" + name;
     }
 
     public String getNpmName() {

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

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

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

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