@autorest/python 6.4.12 → 6.4.14

package/autorest/black/__init__.py

@@ -30,28 +30,22 @@ class BlackScriptPlugin(Plugin):  # pylint: disable=abstract-method
         self.output_folder = Path(output_folder)
 
     def process(self) -> bool:
-        # apply format_file on every file in the output folder
+        # apply format_file on every .py file in the output folder
         list(
             map(
                 self.format_file,
-                [Path(f) for f in self.list_file() if "__pycache__" not in f],
+                [
+                    Path(f)
+                    for f in self.list_file()
+                    if all(item not in f for item in ("__pycache__", "node_modules"))
+                    and Path(f).suffix == ".py"
+                ],
             )
         )
         return True
 
     def format_file(self, file: Path) -> None:
-        try:
-            file_content = self.read_file(file)
-        except Exception as e:  # pylint: disable=broad-except
-            if file.suffix != ".py":
-                _LOGGER.warning(
-                    "Can not read file %s, not blacking this file", file.name
-                )
-                return
-            raise e  # still want to raise if we fail reading a py file
-        if file.suffix != ".py":
-            self.write_file(file, file_content)
-            return
+        file_content = self.read_file(file)
         try:
             file_content = black.format_file_contents(
                 file_content, fast=True, mode=_BLACK_MODE

package/autorest/codegen/templates/model_base.py.jinja2

@@ -58,32 +58,35 @@ def _timedelta_as_isostr(td: timedelta) -> str:
     if days:
         date_str = "%sD" % days
 
-    # Build time
-    time_str = "T"
+    if hours or minutes or seconds:
+        # Build time
+        time_str = "T"
 
-    # Hours
-    bigger_exists = date_str or hours
-    if bigger_exists:
-        time_str += "{:02}H".format(hours)
+        # Hours
+        bigger_exists = date_str or hours
+        if bigger_exists:
+            time_str += "{:02}H".format(hours)
 
-    # Minutes
-    bigger_exists = bigger_exists or minutes
-    if bigger_exists:
-        time_str += "{:02}M".format(minutes)
+        # Minutes
+        bigger_exists = bigger_exists or minutes
+        if bigger_exists:
+            time_str += "{:02}M".format(minutes)
 
-    # Seconds
-    try:
-        if seconds.is_integer():
-            seconds_string = "{:02}".format(int(seconds))
-        else:
-            # 9 chars long w/ leading 0, 6 digits after decimal
-            seconds_string = "%09.6f" % seconds
-            # Remove trailing zeros
-            seconds_string = seconds_string.rstrip("0")
-    except AttributeError:  # int.is_integer() raises
-        seconds_string = "{:02}".format(seconds)
+        # Seconds
+        try:
+            if seconds.is_integer():
+                seconds_string = "{:02}".format(int(seconds))
+            else:
+                # 9 chars long w/ leading 0, 6 digits after decimal
+                seconds_string = "%09.6f" % seconds
+                # Remove trailing zeros
+                seconds_string = seconds_string.rstrip("0")
+        except AttributeError:  # int.is_integer() raises
+            seconds_string = "{:02}".format(seconds)
 
-    time_str += "{}S".format(seconds_string)
+        time_str += "{}S".format(seconds_string)
+    else:
+        time_str = ""
 
     return "P" + date_str + time_str
 
@@ -629,7 +632,7 @@ class _RestField:
         self,
         *,
         name: typing.Optional[str] = None,
-        type: typing.Optional[typing.Callable] = None,
+        type: typing.Optional[typing.Callable] = None,  # pylint: disable=redefined-builtin
         is_discriminator: bool = False,
         readonly: bool = False,
         default: typing.Any = _UNSET,
@@ -648,7 +651,7 @@ class _RestField:
             raise ValueError("Rest name was never set")
         return self._rest_name_input
 
-    def __get__(self, obj: Model, type=None):
+    def __get__(self, obj: Model, type=None):  # pylint: disable=redefined-builtin
         # by this point, type and rest_name will have a value bc we default
         # them in __new__ of the Model class
         item = obj.get(self._rest_name)
@@ -677,7 +680,7 @@ class _RestField:
 def rest_field(
     *,
     name: typing.Optional[str] = None,
-    type: typing.Optional[typing.Callable] = None,
+    type: typing.Optional[typing.Callable] = None,  # pylint: disable=redefined-builtin
     readonly: bool = False,
     default: typing.Any = _UNSET,
 ) -> typing.Any:
@@ -685,6 +688,8 @@ def rest_field(
 
 
 def rest_discriminator(
-    *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None
+    *,
+    name: typing.Optional[str] = None,
+    type: typing.Optional[typing.Callable] = None,  # pylint: disable=redefined-builtin
 ) -> typing.Any:
     return _RestField(name=name, type=type, is_discriminator=True)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.4.12",
+  "version": "6.4.14",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {