summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Mangin <thomas.mangin@exa.net.uk>2020-04-05 23:08:09 +0100
committerThomas Mangin <thomas.mangin@exa.net.uk>2020-04-06 20:22:35 +0100
commit7256810914e6664bf92041dcd7c3daf649ce0001 (patch)
tree6e7b0971ecd8859cff864b3ebb37f86f8ba288f5
parentecf1e3d499d8a825bb675e11c07bbc7b0981c431 (diff)
downloadvyos-1x-7256810914e6664bf92041dcd7c3daf649ce0001.tar.gz
vyos-1x-7256810914e6664bf92041dcd7c3daf649ce0001.zip
util: T2226: remove all references to subprocess_cmd
-rw-r--r--python/vyos/util.py8
-rwxr-xr-xsrc/conf_mode/system-syslog.py1
-rwxr-xr-xsrc/conf_mode/vpn_sstp.py2
3 files changed, 1 insertions, 10 deletions
diff --git a/python/vyos/util.py b/python/vyos/util.py
index e0030d1bd..fa2b4dd99 100644
--- a/python/vyos/util.py
+++ b/python/vyos/util.py
@@ -89,14 +89,6 @@ def cmd(command, section='', shell=None, input=None, timeout=None, env=None, uni
return decoded
-# This is now deprecated
-def subprocess_cmd(command):
- """ execute arbitrary command via Popen """
- from subprocess import Popen, PIPE
- p = Popen(command, stdout=PIPE, shell=True)
- p.communicate()
-
-
# file manipulation
diff --git a/src/conf_mode/system-syslog.py b/src/conf_mode/system-syslog.py
index 915a631ec..25b9b5bed 100755
--- a/src/conf_mode/system-syslog.py
+++ b/src/conf_mode/system-syslog.py
@@ -22,7 +22,6 @@ from sys import exit
from vyos.config import Config
from vyos.defaults import directories as vyos_data_dir
-from vyos.util import subprocess_cmd
from vyos import ConfigError
from vyos.util import run
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py
index d4fd0f4a3..ca0844c50 100755
--- a/src/conf_mode/vpn_sstp.py
+++ b/src/conf_mode/vpn_sstp.py
@@ -26,7 +26,7 @@ from jinja2 import FileSystemLoader, Environment
from vyos.config import Config
from vyos import ConfigError
from vyos.defaults import directories as vyos_data_dir
-from vyos.util import process_running, subprocess_cmd
+from vyos.util import process_running
from vyos.util import process_running, cmd, run
pidfile = r'/var/run/accel_sstp.pid'