From e1db5099b523784d44a7d1f2f83410272dc1119e Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Mon, 2 Sep 2019 23:23:47 +0200 Subject: [PATCH] Remove unused import --- wo/cli/plugins/debug.py | 1 - wo/cli/plugins/site_functions.py | 3 --- wo/cli/plugins/stack.py | 9 +++++---- wo/cli/plugins/stack_pref.py | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/wo/cli/plugins/debug.py b/wo/cli/plugins/debug.py index 649cfea..391b3fc 100644 --- a/wo/cli/plugins/debug.py +++ b/wo/cli/plugins/debug.py @@ -15,7 +15,6 @@ import os import configparser import glob import signal -import subprocess def wo_debug_hook(app): diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index e51e5f3..251d98d 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -241,9 +241,6 @@ def setupwordpress(self, data, vhostonly=False): wo_random_pass = (''.join(random.sample(string.ascii_uppercase + string.ascii_lowercase + string.digits, 24))) - wo_random = (''.join(random.sample(string.ascii_uppercase + - string.ascii_lowercase + - string.digits, 8))) wo_wp_prefix = '' # wo_wp_user = '' # wo_wp_pass = '' diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index 68148ad..a09269d 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -200,8 +200,8 @@ class WOStackController(CementBaseController): Log.debug(self, "Setting apt_packages variable for PHP 7.2") if not (WOAptGet.is_installed(self, 'php7.2-fpm')): if not (WOAptGet.is_installed(self, 'php7.3-fpm')): - apt_packages = apt_packages + WOVariables.wo_php + \ - WOVariables.wo_php_extra + apt_packages = (apt_packages + WOVariables.wo_php + + WOVariables.wo_php_extra) else: apt_packages = apt_packages + WOVariables.wo_php else: @@ -213,8 +213,9 @@ class WOStackController(CementBaseController): Log.debug(self, "Setting apt_packages variable for PHP 7.3") if not WOAptGet.is_installed(self, 'php7.3-fpm'): if not (WOAptGet.is_installed(self, 'php7.2-fpm')): - apt_packages = apt_packages + WOVariables.wo_php + \ - WOVariables.wo_php73 + WOVariables.wo_php_extra + apt_packages = (apt_packages + WOVariables.wo_php + + WOVariables.wo_php73 + + WOVariables.wo_php_extra) else: apt_packages = apt_packages + WOVariables.wo_php73 else: diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index 246a6da..8699d12 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -5,9 +5,9 @@ import random import shutil import string +import psutil import requests -import psutil from wo.cli.plugins.site_functions import * from wo.cli.plugins.stack_services import WOStackStatusController from wo.core.apt_repo import WORepo