diff --git a/pype/hosts/tvpaint/hooks/pre_install_pywin.py b/pype/hosts/tvpaint/hooks/pre_install_pywin.py index ca9242c4c8..7abab33757 100644 --- a/pype/hosts/tvpaint/hooks/pre_install_pywin.py +++ b/pype/hosts/tvpaint/hooks/pre_install_pywin.py @@ -1,7 +1,7 @@ from pype.lib import ( PreLaunchHook, ApplicationLaunchFailed, - _subprocess + run_subprocess ) @@ -25,7 +25,7 @@ class PreInstallPyWin(PreLaunchHook): return try: - output = _subprocess( + output = run_subprocess( ["pip", "install", "pywin32==227"] ) self.log.debug("Pip install pywin32 output:\n{}'".format(output)) diff --git a/pype/plugins/global/publish/extract_burnin.py b/pype/plugins/global/publish/extract_burnin.py index d29af63483..fc3adb81d5 100644 --- a/pype/plugins/global/publish/extract_burnin.py +++ b/pype/plugins/global/publish/extract_burnin.py @@ -264,7 +264,9 @@ class ExtractBurnin(pype.api.Extractor): self.log.debug("Executing: {}".format(subprcs_cmd)) # Run burnin script - pype.api.subprocess(subprcs_cmd, shell=True, logger=self.log) + pype.api.run_subprocess( + subprcs_cmd, shell=True, logger=self.log + ) # Remove the temporary json os.remove(temporary_json_filepath) diff --git a/pype/plugins/global/publish/extract_jpeg.py b/pype/plugins/global/publish/extract_jpeg.py index af90d4366d..cdacf79c6d 100644 --- a/pype/plugins/global/publish/extract_jpeg.py +++ b/pype/plugins/global/publish/extract_jpeg.py @@ -107,7 +107,9 @@ class ExtractJpegEXR(pyblish.api.InstancePlugin): # run subprocess self.log.debug("{}".format(subprocess_jpeg)) try: # temporary until oiiotool is supported cross platform - pype.api.subprocess(subprocess_jpeg, shell=True) + pype.api.run_subprocess( + subprocess_jpeg, shell=True, logger=self.log + ) except RuntimeError as exp: if "Compression" in str(exp): self.log.debug("Unsupported compression on input files. " + diff --git a/pype/plugins/global/publish/extract_review.py b/pype/plugins/global/publish/extract_review.py index 37fe83bf10..132e5ab91e 100644 --- a/pype/plugins/global/publish/extract_review.py +++ b/pype/plugins/global/publish/extract_review.py @@ -206,7 +206,7 @@ class ExtractReview(pyblish.api.InstancePlugin): # run subprocess self.log.debug("Executing: {}".format(subprcs_cmd)) - pype.api.subprocess( + pype.api.run_subprocess( subprcs_cmd, shell=True, logger=self.log ) @@ -1628,8 +1628,9 @@ class ExtractReview(pyblish.api.InstancePlugin): # run subprocess self.log.debug("Executing: {}".format(subprcs_cmd)) - output = pype.api.subprocess(subprcs_cmd, shell=True) - self.log.debug("Output: {}".format(output)) + output = pype.api.run_subprocess( + subprcs_cmd, shell=True, logger=self.log + ) # create representation data repre_new.update({ diff --git a/pype/plugins/global/publish/extract_review_slate.py b/pype/plugins/global/publish/extract_review_slate.py index 5cf632406c..3614b1e056 100644 --- a/pype/plugins/global/publish/extract_review_slate.py +++ b/pype/plugins/global/publish/extract_review_slate.py @@ -186,8 +186,9 @@ class ExtractReviewSlate(pype.api.Extractor): # run slate generation subprocess self.log.debug("Slate Executing: {}".format(slate_subprcs_cmd)) - slate_output = pype.api.subprocess(slate_subprcs_cmd, shell=True) - self.log.debug("Slate Output: {}".format(slate_output)) + slate_output = pype.api.run_subprocess( + slate_subprcs_cmd, shell=True, logger=self.log + ) # create ffmpeg concat text file path conc_text_file = input_file.replace(ext, "") + "_concat" + ".txt" @@ -221,8 +222,9 @@ class ExtractReviewSlate(pype.api.Extractor): # ffmpeg concat subprocess self.log.debug("Executing concat: {}".format(concat_subprcs_cmd)) - concat_output = pype.api.subprocess(concat_subprcs_cmd, shell=True) - self.log.debug("Output concat: {}".format(concat_output)) + concat_output = pype.api.run_subprocess( + concat_subprcs_cmd, shell=True, logger=self.log + ) self.log.debug("__ repre[tags]: {}".format(repre["tags"])) repre_update = { diff --git a/pype/plugins/global/publish/extract_scanline_exr.py b/pype/plugins/global/publish/extract_scanline_exr.py index 9c3073d61d..a801baa17c 100644 --- a/pype/plugins/global/publish/extract_scanline_exr.py +++ b/pype/plugins/global/publish/extract_scanline_exr.py @@ -65,7 +65,7 @@ class ExtractScanlineExr(pyblish.api.InstancePlugin): subprocess_exr = " ".join(oiio_cmd) self.log.info(f"running: {subprocess_exr}") - pype.api.subprocess(subprocess_exr) + pype.api.run_subprocess(subprocess_exr, logger=self.log) # raise error if there is no ouptput if not os.path.exists(os.path.join(stagingdir, original_name)): diff --git a/pype/plugins/hiero/publish/extract_review_cutup.py b/pype/plugins/hiero/publish/extract_review_cutup.py index 87e584d0b0..ec3a9ec17e 100644 --- a/pype/plugins/hiero/publish/extract_review_cutup.py +++ b/pype/plugins/hiero/publish/extract_review_cutup.py @@ -142,7 +142,7 @@ class ExtractReviewCutUp(pype.api.Extractor): ).format(**locals()) self.log.debug("ffprob_cmd: {}".format(ffprob_cmd)) - audio_check_output = pype.api.subprocess(ffprob_cmd) + audio_check_output = pype.api.run_subprocess(ffprob_cmd) self.log.debug( "audio_check_output: {}".format(audio_check_output)) @@ -177,7 +177,7 @@ class ExtractReviewCutUp(pype.api.Extractor): # try to get video native resolution data try: - resolution_output = pype.api.subprocess(( + resolution_output = pype.api.run_subprocess(( "\"{ffprobe_path}\" -i \"{full_input_path}\"" " -v error " "-select_streams v:0 -show_entries " @@ -290,8 +290,7 @@ class ExtractReviewCutUp(pype.api.Extractor): # run subprocess self.log.debug("Executing: {}".format(subprcs_cmd)) - output = pype.api.subprocess(subprcs_cmd) - self.log.debug("Output: {}".format(output)) + pype.api.run_subprocess(subprcs_cmd, logger=self.log) repre_new = { "files": new_files, diff --git a/pype/plugins/photoshop/publish/extract_review.py b/pype/plugins/photoshop/publish/extract_review.py index 2753cbf366..aa9151bf6d 100644 --- a/pype/plugins/photoshop/publish/extract_review.py +++ b/pype/plugins/photoshop/publish/extract_review.py @@ -60,7 +60,7 @@ class ExtractReview(pype.api.Extractor): "-vframes", "1", thumbnail_path ] - output = pype.lib._subprocess(args) + output = pype.lib.run_subprocess(args) instance.data["representations"].append({ "name": "thumbnail", @@ -78,7 +78,7 @@ class ExtractReview(pype.api.Extractor): "-vframes", "1", mov_path ] - output = pype.lib._subprocess(args) + output = pype.lib.run_subprocess(args) self.log.debug(output) instance.data["representations"].append({ "name": "mov", diff --git a/pype/plugins/standalonepublisher/publish/collect_editorial.py b/pype/plugins/standalonepublisher/publish/collect_editorial.py index 7e532c3741..afbdd87b2d 100644 --- a/pype/plugins/standalonepublisher/publish/collect_editorial.py +++ b/pype/plugins/standalonepublisher/publish/collect_editorial.py @@ -35,7 +35,7 @@ class OTIO_View(pyblish.api.Action): file_path = os.path.join( representation["stagingDir"], representation["files"] ) - plib._subprocess(["otioview", file_path]) + plib.run_subprocess(["otioview", file_path]) class CollectEditorial(pyblish.api.InstancePlugin): diff --git a/pype/plugins/standalonepublisher/publish/extract_trim_video_audio.py b/pype/plugins/standalonepublisher/publish/extract_trim_video_audio.py index 193902a9f6..1c53ae5f46 100644 --- a/pype/plugins/standalonepublisher/publish/extract_trim_video_audio.py +++ b/pype/plugins/standalonepublisher/publish/extract_trim_video_audio.py @@ -80,8 +80,9 @@ class ExtractTrimVideoAudio(pype.api.Extractor): self.log.info(f"Processing: {args}") ffmpeg_args = " ".join(args) - output = pype.api.subprocess(ffmpeg_args, shell=True) - self.log.info(output) + pype.api.run_subprocess( + ffmpeg_args, shell=True, logger=self.log + ) repr = { "name": ext[1:], diff --git a/pype/tests/test_lib_restructuralization.py b/pype/tests/test_lib_restructuralization.py index 957167a8bf..840baff5e6 100644 --- a/pype/tests/test_lib_restructuralization.py +++ b/pype/tests/test_lib_restructuralization.py @@ -29,7 +29,7 @@ def test_backward_compatibility(printer): from pype.hosts.fusion.lib import switch_item from pype.lib import source_hash - from pype.lib import _subprocess + from pype.lib import run_subprocess except ImportError as e: raise