Merge pull request #10957 from swagger-api/goDeni-issue-10948

Go deni issue 10948
swagger-api · Mar 28, 2021 · e5ef6cb · e5ef6cb
2 parents 7d8ec67 + 3a9fd55
commit e5ef6cb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java
@@ -25,6 +25,8 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
     public static final String PACKAGE_URL = "packageUrl";
     public static final String DEFAULT_LIBRARY = "urllib3";
 
+    public static final String WRITE_BINARY_OPTION = "writeBinary";
+
     protected String packageName; // e.g. petstore_api
     protected String packageVersion;
     protected String projectName; // for setup.py, e.g. petstore-api
@@ -174,6 +176,11 @@ public void processOpts() {
             setPackageVersion("1.0.0");
         }
 
+        if (additionalProperties.containsKey(WRITE_BINARY_OPTION)) {
+            boolean optionValue = Boolean.parseBoolean(String.valueOf(additionalProperties.get(WRITE_BINARY_OPTION)));
+            additionalProperties.put(WRITE_BINARY_OPTION, optionValue);
+        }
+
         additionalProperties.put(CodegenConstants.PROJECT_NAME, projectName);
         additionalProperties.put(CodegenConstants.PACKAGE_NAME, packageName);
         additionalProperties.put(CodegenConstants.PACKAGE_VERSION, packageVersion);

diff --git a/modules/swagger-codegen/src/main/resources/python/api_client.mustache b/modules/swagger-codegen/src/main/resources/python/api_client.mustache
@@ -540,7 +540,7 @@ class ApiClient(object):
                                  content_disposition).group(1)
             path = os.path.join(os.path.dirname(path), filename)
 
-        with open(path, "wb") as f:
+        with open(path, {{^writeBinary}}"w"{{/writeBinary}}{{#writeBinary}}"wb"{{/writeBinary}}) as f:
             f.write(response.data)
 
         return path

diff --git a/samples/client/petstore/python/.swagger-codegen/VERSION b/samples/client/petstore/python/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.19-SNAPSHOT
+2.4.20-SNAPSHOT
diff --git a/samples/client/petstore/python/petstore_api/api_client.py b/samples/client/petstore/python/petstore_api/api_client.py
@@ -534,7 +534,7 @@ def __deserialize_file(self, response):
                                  content_disposition).group(1)
             path = os.path.join(os.path.dirname(path), filename)
 
-        with open(path, "wb") as f:
+        with open(path, "w") as f:
             f.write(response.data)
 
         return path