@autorest/python 6.1.9 → 6.1.10

package/autorest/m4reformatter/__init__.py

@@ -386,7 +386,7 @@ def update_response(
 def _get_default_content_type(  # pylint: disable=too-many-return-statements
     content_types: Iterable[str],
 ) -> Optional[str]:
-    json_values = [ct for ct in content_types if JSON_REGEXP.match(ct)]
+    json_values = [ct for ct in content_types if JSON_REGEXP.match(ct.split(";")[0])]
     if json_values:
         if "application/json" in json_values:
             return "application/json"

package/autorest/postprocess/__init__.py

@@ -131,11 +131,13 @@ class PostProcessPlugin(Plugin):  # pylint: disable=abstract-method
             f for f in folders if f.stem in ["operations", "_operations"]
         ]
         for operations_folder in operations_folders:
-            aio = ".aio" if operations_folder.parent.stem == "aio" else ""
+            sub_namespace = ".".join(
+                str(operations_folder.relative_to(self.base_folder)).split(os.sep)
+            )
             self.fix_imports_in_init(
                 generated_file_name="_operations",
                 folder_path=operations_folder,
-                namespace=f"{self.namespace}{aio}.{operations_folder.stem}",
+                namespace=f"{self.namespace}.{sub_namespace}",
             )
         shutil.rmtree(f"{str(self.output_folder)}/.temp_folder")
         return True
@@ -155,7 +157,7 @@ class PostProcessPlugin(Plugin):  # pylint: disable=abstract-method
             k: None for k in customized_objects_str.split(",")
         }.keys()  # filter out duplicates
         file = (folder_path / "__init__.py").relative_to(self.output_folder)
-        file_content = self.read_file(file)
+        file_content = self.read_file(file).replace("\r\n", "\n")
         added_objs = []
         for obj in customized_objects:
             if f" import {obj}\n" in file_content:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.1.9",
+  "version": "6.1.10",
   "description": "The Python extension for generators in AutoRest.",
   "repository": {
     "type": "git",