|
|
1f8f5b |
From f625b0fb215013ff7bc50e78e82e34118c0e55d3 Mon Sep 17 00:00:00 2001
|
|
|
1f8f5b |
From: Ivan Devat <idevat@redhat.com>
|
|
|
1f8f5b |
Date: Mon, 20 Apr 2020 12:22:05 +0200
|
|
|
1f8f5b |
Subject: [PATCH] use subprocess32 instead of subprocess
|
|
|
1f8f5b |
|
|
|
1f8f5b |
See rhbz#1820813 for details.
|
|
|
1f8f5b |
---
|
|
|
1f8f5b |
pcs/cluster.py | 2 +-
|
|
|
1f8f5b |
pcs/lib/external.py | 2 +-
|
|
|
1f8f5b |
pcs/test/test_lib_external.py | 2 +-
|
|
|
1f8f5b |
pcs/utils.py | 2 +-
|
|
|
1f8f5b |
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
1f8f5b |
|
|
|
1f8f5b |
diff --git a/pcs/cluster.py b/pcs/cluster.py
|
|
|
1f8f5b |
index e8fa0ce4..97414f83 100644
|
|
|
1f8f5b |
--- a/pcs/cluster.py
|
|
|
1f8f5b |
+++ b/pcs/cluster.py
|
|
|
1f8f5b |
@@ -6,7 +6,7 @@ from __future__ import (
|
|
|
1f8f5b |
|
|
|
1f8f5b |
import math
|
|
|
1f8f5b |
import os
|
|
|
1f8f5b |
-import subprocess
|
|
|
1f8f5b |
+import subprocess32 as subprocess
|
|
|
1f8f5b |
import re
|
|
|
1f8f5b |
import sys
|
|
|
1f8f5b |
import socket
|
|
|
1f8f5b |
diff --git a/pcs/lib/external.py b/pcs/lib/external.py
|
|
|
1f8f5b |
index 852929b2..c399256b 100644
|
|
|
1f8f5b |
--- a/pcs/lib/external.py
|
|
|
1f8f5b |
+++ b/pcs/lib/external.py
|
|
|
1f8f5b |
@@ -17,7 +17,7 @@ except ImportError:
|
|
|
1f8f5b |
from shlex import quote as shell_quote
|
|
|
1f8f5b |
import re
|
|
|
1f8f5b |
import signal
|
|
|
1f8f5b |
-import subprocess
|
|
|
1f8f5b |
+import subprocess32 as subprocess
|
|
|
1f8f5b |
import sys
|
|
|
1f8f5b |
try:
|
|
|
1f8f5b |
# python2
|
|
|
1f8f5b |
diff --git a/pcs/test/test_lib_external.py b/pcs/test/test_lib_external.py
|
|
|
1f8f5b |
index 827cb801..58655cc8 100644
|
|
|
1f8f5b |
--- a/pcs/test/test_lib_external.py
|
|
|
1f8f5b |
+++ b/pcs/test/test_lib_external.py
|
|
|
1f8f5b |
@@ -35,7 +35,7 @@ _service = settings.service_binary
|
|
|
1f8f5b |
_systemctl = settings.systemctl_binary
|
|
|
1f8f5b |
|
|
|
1f8f5b |
|
|
|
1f8f5b |
-@mock.patch("subprocess.Popen", autospec=True)
|
|
|
1f8f5b |
+@mock.patch("subprocess32.Popen", autospec=True)
|
|
|
1f8f5b |
class CommandRunnerTest(TestCase):
|
|
|
1f8f5b |
def setUp(self):
|
|
|
1f8f5b |
self.mock_logger = mock.MagicMock(logging.Logger)
|
|
|
1f8f5b |
diff --git a/pcs/utils.py b/pcs/utils.py
|
|
|
1f8f5b |
index 73721a2a..eb756581 100644
|
|
|
1f8f5b |
--- a/pcs/utils.py
|
|
|
1f8f5b |
+++ b/pcs/utils.py
|
|
|
1f8f5b |
@@ -6,7 +6,7 @@ from __future__ import (
|
|
|
1f8f5b |
|
|
|
1f8f5b |
import os
|
|
|
1f8f5b |
import sys
|
|
|
1f8f5b |
-import subprocess
|
|
|
1f8f5b |
+import subprocess32 as subprocess
|
|
|
1f8f5b |
import xml.dom.minidom
|
|
|
1f8f5b |
from xml.dom.minidom import parseString, parse
|
|
|
1f8f5b |
import xml.etree.ElementTree as ET
|
|
|
1f8f5b |
--
|
|
|
1f8f5b |
2.21.0
|
|
|
1f8f5b |
|