Merge pull request #3538 from pypeclub/bugfix/get_workdir_return_type

General: Create workfile documents works again

openpype/hosts/flame/plugins/publish/integrate_batch_group.py

@@ -323,6 +323,8 @@ class IntegrateBatchGroup(pyblish.api.InstancePlugin):
     def _get_shot_task_dir_path(self, instance, task_data):
         project_doc = instance.data["projectEntity"]
         asset_entity = instance.data["assetEntity"]
+        anatomy = instance.context.data["anatomy"]
 
         return get_workdir(
-            project_doc, asset_entity, task_data["name"], "flame")
+            project_doc, asset_entity, task_data["name"], "flame", anatomy
+        )

openpype/lib/avalon_context.py

@@ -582,10 +582,10 @@ def get_workdir_with_workdir_data(
 
     anatomy_filled = anatomy.format(workdir_data)
     # Output is TemplateResult object which contain useful data
-    path = anatomy_filled[template_key]["folder"]
-    if path:
-        path = os.path.normpath(path)
-    return path
+    output = anatomy_filled[template_key]["folder"]
+    if output:
+        return output.normalized()
+    return output
 
 
 def get_workdir(

openpype/lib/path_templates.py

@@ -409,6 +409,19 @@ class TemplateResult(str):
             self.invalid_types
         )
 
+    def normalized(self):
+        """Convert to normalized path."""
+
+        cls = self.__class__
+        return cls(
+            os.path.normpath(self),
+            self.template,
+            self.solved,
+            self.used_values,
+            self.missing_keys,
+            self.invalid_types
+        )
+
 
 class TemplatesResultDict(dict):
     """Holds and wrap TemplateResults for easy bug report."""

openpype/pipeline/anatomy.py

@@ -380,6 +380,19 @@ class AnatomyTemplateResult(TemplateResult):
         )
         return self.__class__(tmp, self.rootless)
 
+    def normalized(self):
+        """Convert to normalized path."""
+
+        tmp = TemplateResult(
+            os.path.normpath(self),
+            self.template,
+            self.solved,
+            self.used_values,
+            self.missing_keys,
+            self.invalid_types
+        )
+        return self.__class__(tmp, self.rootless)
+
 
 class AnatomyTemplates(TemplatesDict):
     inner_key_pattern = re.compile(r"(\{@.*?[^{}0]*\})")