From 201d36589935b92c137a2a4810e2a406ad0d9be5 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 24 Jun 2024 12:31:29 +0200 Subject: [PATCH 1/3] Cosmetics (fix docstring triple quotes) --- .../client/ayon_aftereffects/api/workfile_template_builder.py | 2 +- .../client/ayon_blender/plugins/publish/extract_thumbnail.py | 2 +- .../client/ayon_hiero/vendor/google/protobuf/text_format.py | 2 +- .../nuke/client/ayon_nuke/vendor/google/protobuf/text_format.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server_addon/aftereffects/client/ayon_aftereffects/api/workfile_template_builder.py b/server_addon/aftereffects/client/ayon_aftereffects/api/workfile_template_builder.py index 77fd1059b5..a4d90be548 100644 --- a/server_addon/aftereffects/client/ayon_aftereffects/api/workfile_template_builder.py +++ b/server_addon/aftereffects/client/ayon_aftereffects/api/workfile_template_builder.py @@ -92,7 +92,7 @@ class AEPlaceholderPlugin(PlaceholderPlugin): return None, None def _collect_scene_placeholders(self): - """" Cache placeholder data to shared data. + """ Cache placeholder data to shared data. Returns: (list) of dicts """ diff --git a/server_addon/blender/client/ayon_blender/plugins/publish/extract_thumbnail.py b/server_addon/blender/client/ayon_blender/plugins/publish/extract_thumbnail.py index 40097aaa89..e3bce8bf73 100644 --- a/server_addon/blender/client/ayon_blender/plugins/publish/extract_thumbnail.py +++ b/server_addon/blender/client/ayon_blender/plugins/publish/extract_thumbnail.py @@ -83,7 +83,7 @@ class ExtractThumbnail(plugin.BlenderExtractor): instance.data["representations"].append(representation) def _fix_output_path(self, filepath): - """"Workaround to return correct filepath. + """Workaround to return correct filepath. To workaround this we just glob.glob() for any file extensions and assume the latest modified file is the correct file and return it. diff --git a/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/text_format.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/text_format.py index 412385c26f..39739e21fb 100644 --- a/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/text_format.py +++ b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/text_format.py @@ -548,7 +548,7 @@ class _Printer(object): self.out.write(' ' if self.as_one_line else '\n') def _PrintShortRepeatedPrimitivesValue(self, field, value): - """"Prints short repeated primitives value.""" + """Prints short repeated primitives value.""" # Note: this is called only when value has at least one element. self._PrintFieldName(field) self.out.write(' [') diff --git a/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/text_format.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/text_format.py index 412385c26f..39739e21fb 100644 --- a/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/text_format.py +++ b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/text_format.py @@ -548,7 +548,7 @@ class _Printer(object): self.out.write(' ' if self.as_one_line else '\n') def _PrintShortRepeatedPrimitivesValue(self, field, value): - """"Prints short repeated primitives value.""" + """Prints short repeated primitives value.""" # Note: this is called only when value has at least one element. self._PrintFieldName(field) self.out.write(' [') From 28dede482fedddebf272696c85b21db8fca909f3 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 24 Jun 2024 14:37:48 +0200 Subject: [PATCH 2/3] Update server_addon/aftereffects/client/ayon_aftereffects/api/workfile_template_builder.py Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- .../client/ayon_aftereffects/api/workfile_template_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_addon/aftereffects/client/ayon_aftereffects/api/workfile_template_builder.py b/server_addon/aftereffects/client/ayon_aftereffects/api/workfile_template_builder.py index a4d90be548..7fbd469851 100644 --- a/server_addon/aftereffects/client/ayon_aftereffects/api/workfile_template_builder.py +++ b/server_addon/aftereffects/client/ayon_aftereffects/api/workfile_template_builder.py @@ -92,7 +92,7 @@ class AEPlaceholderPlugin(PlaceholderPlugin): return None, None def _collect_scene_placeholders(self): - """ Cache placeholder data to shared data. + """Cache placeholder data to shared data. Returns: (list) of dicts """ From e342f9fe0d6594e930f28ed83617ee61c33a7602 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 24 Jun 2024 14:49:23 +0200 Subject: [PATCH 3/3] Revert changes to vendorized files Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> --- .../client/ayon_hiero/vendor/google/protobuf/text_format.py | 2 +- .../nuke/client/ayon_nuke/vendor/google/protobuf/text_format.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/text_format.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/text_format.py index 39739e21fb..412385c26f 100644 --- a/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/text_format.py +++ b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/text_format.py @@ -548,7 +548,7 @@ class _Printer(object): self.out.write(' ' if self.as_one_line else '\n') def _PrintShortRepeatedPrimitivesValue(self, field, value): - """Prints short repeated primitives value.""" + """"Prints short repeated primitives value.""" # Note: this is called only when value has at least one element. self._PrintFieldName(field) self.out.write(' [') diff --git a/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/text_format.py b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/text_format.py index 39739e21fb..412385c26f 100644 --- a/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/text_format.py +++ b/server_addon/nuke/client/ayon_nuke/vendor/google/protobuf/text_format.py @@ -548,7 +548,7 @@ class _Printer(object): self.out.write(' ' if self.as_one_line else '\n') def _PrintShortRepeatedPrimitivesValue(self, field, value): - """Prints short repeated primitives value.""" + """"Prints short repeated primitives value.""" # Note: this is called only when value has at least one element. self._PrintFieldName(field) self.out.write(' [')