From bec2c94be298b0f6805d815e4b511f103293a8db Mon Sep 17 00:00:00 2001 From: Jeff Bachtel Date: Tue, 2 Mar 2021 15:00:08 -0700 Subject: [PATCH 1/3] Update the cmd return type --- python_terraform/terraform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_terraform/terraform.py b/python_terraform/terraform.py index 8117da1..b8a89a0 100644 --- a/python_terraform/terraform.py +++ b/python_terraform/terraform.py @@ -25,7 +25,7 @@ class IsNotFlagged(TerraformFlag): pass -CommandOutput = Tuple[Optional[int], Optional[str], Optional[str]] +CommandOutput = Tuple[Union[int, subprocess.Popen[bytes], None], Optional[str], Optional[str]] class TerraformCommandError(subprocess.CalledProcessError): From fc13c32ecc8a956b6ba4dcc464124bc26da414e3 Mon Sep 17 00:00:00 2001 From: Jeff Bachtel Date: Tue, 2 Mar 2021 15:00:20 -0700 Subject: [PATCH 2/3] Return the Popen object for synchronous=True --- python_terraform/terraform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_terraform/terraform.py b/python_terraform/terraform.py index b8a89a0..d1aa66f 100644 --- a/python_terraform/terraform.py +++ b/python_terraform/terraform.py @@ -342,7 +342,7 @@ def cmd( ) if not synchronous: - return None, None, None + return p, None, None out, err = p.communicate() ret_code = p.returncode From 4a43cd4743795c42838a19336c7b411f0ee68a2e Mon Sep 17 00:00:00 2001 From: Jeff Bachtel Date: Tue, 2 Mar 2021 15:26:25 -0700 Subject: [PATCH 3/3] make python 3.6-3.8 compat --- python_terraform/terraform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_terraform/terraform.py b/python_terraform/terraform.py index d1aa66f..adf2d4d 100644 --- a/python_terraform/terraform.py +++ b/python_terraform/terraform.py @@ -25,7 +25,7 @@ class IsNotFlagged(TerraformFlag): pass -CommandOutput = Tuple[Union[int, subprocess.Popen[bytes], None], Optional[str], Optional[str]] +CommandOutput = Tuple[Union[int, subprocess.Popen, None], Optional[str], Optional[str]] class TerraformCommandError(subprocess.CalledProcessError):