diff options
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | sos/archive.py | 5 | ||||
| -rw-r--r-- | sos/plugins/alternatives.py | 1 | ||||
| -rw-r--r-- | sos/plugins/atomichost.py | 1 | ||||
| -rw-r--r-- | sos/plugins/cman.py | 1 | ||||
| -rw-r--r-- | sos/plugins/crio.py | 2 | ||||
| -rw-r--r-- | sos/plugins/iprconfig.py | 1 | ||||
| -rw-r--r-- | sos/plugins/navicli.py | 2 | ||||
| -rw-r--r-- | sos/plugins/networking.py | 1 | ||||
| -rw-r--r-- | sos/plugins/ovirt_hosted_engine.py | 4 | ||||
| -rw-r--r-- | sos/plugins/ovirt_imageio.py | 4 | ||||
| -rw-r--r-- | sos/plugins/postgresql.py | 4 | ||||
| -rw-r--r-- | sos/plugins/symcli.py | 2 | ||||
| -rw-r--r-- | sos/plugins/virsh.py | 2 | ||||
| -rw-r--r-- | sos/plugins/xen.py | 1 | ||||
| -rw-r--r-- | sos/policies/redhat.py | 2 | ||||
| -rw-r--r-- | sos/sosreport.py | 2 |
17 files changed, 7 insertions, 30 deletions
@@ -4,7 +4,7 @@ from distutils.core import setup from distutils.command.build import build from distutils.command.install_data import install_data from distutils.dep_util import newer -from distutils.log import warn, info, error +from distutils.log import error import glob import os diff --git a/sos/archive.py b/sos/archive.py index baa05c94..91219318 100644 --- a/sos/archive.py +++ b/sos/archive.py @@ -10,12 +10,9 @@ # # See the LICENSE file in the source distribution for further information. import os -import time import tarfile import shutil import logging -import shlex -import re import codecs import sys import errno @@ -23,7 +20,7 @@ import stat from threading import Lock # required for compression callout (FIXME: move to policy?) -from subprocess import Popen, PIPE +from subprocess import Popen from sos.utilities import sos_get_command_output, is_executable diff --git a/sos/plugins/alternatives.py b/sos/plugins/alternatives.py index acf68665..f2430cd4 100644 --- a/sos/plugins/alternatives.py +++ b/sos/plugins/alternatives.py @@ -9,7 +9,6 @@ # See the LICENSE file in the source distribution for further information. from sos.plugins import Plugin, RedHatPlugin -from sos.utilities import is_executable class Alternatives(Plugin, RedHatPlugin): diff --git a/sos/plugins/atomichost.py b/sos/plugins/atomichost.py index 0c1f4026..1183943e 100644 --- a/sos/plugins/atomichost.py +++ b/sos/plugins/atomichost.py @@ -9,7 +9,6 @@ # See the LICENSE file in the source distribution for further information. from sos.plugins import Plugin, RedHatPlugin -import os.path class AtomicHost(Plugin, RedHatPlugin): diff --git a/sos/plugins/cman.py b/sos/plugins/cman.py index d5f65166..7cf3a067 100644 --- a/sos/plugins/cman.py +++ b/sos/plugins/cman.py @@ -7,7 +7,6 @@ # See the LICENSE file in the source distribution for further information. from sos.plugins import Plugin, RedHatPlugin -import re from glob import glob diff --git a/sos/plugins/crio.py b/sos/plugins/crio.py index 7afdf047..279ea1fe 100644 --- a/sos/plugins/crio.py +++ b/sos/plugins/crio.py @@ -8,7 +8,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin +from sos.plugins import Plugin class CRIO(Plugin, RedHatPlugin, UbuntuPlugin): diff --git a/sos/plugins/iprconfig.py b/sos/plugins/iprconfig.py index 11742654..62f94213 100644 --- a/sos/plugins/iprconfig.py +++ b/sos/plugins/iprconfig.py @@ -8,7 +8,6 @@ # This plugin enables collection of logs for Power systems -import os import re from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin from sos.utilities import is_executable diff --git a/sos/plugins/navicli.py b/sos/plugins/navicli.py index 965dbd1f..e6652677 100644 --- a/sos/plugins/navicli.py +++ b/sos/plugins/navicli.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, os +from sos.plugins import Plugin, RedHatPlugin from sos.utilities import is_executable diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py index aef9d195..07a7285d 100644 --- a/sos/plugins/networking.py +++ b/sos/plugins/networking.py @@ -7,7 +7,6 @@ # See the LICENSE file in the source distribution for further information. from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin -import os import re diff --git a/sos/plugins/ovirt_hosted_engine.py b/sos/plugins/ovirt_hosted_engine.py index 2f96ddbf..3d1bfe36 100644 --- a/sos/plugins/ovirt_hosted_engine.py +++ b/sos/plugins/ovirt_hosted_engine.py @@ -8,10 +8,6 @@ # # See the LICENSE file in the source distribution for further information. - -import glob - - from sos.plugins import Plugin, RedHatPlugin diff --git a/sos/plugins/ovirt_imageio.py b/sos/plugins/ovirt_imageio.py index 58256c62..e9a2d8bf 100644 --- a/sos/plugins/ovirt_imageio.py +++ b/sos/plugins/ovirt_imageio.py @@ -8,10 +8,6 @@ # # See the LICENSE file in the source distribution for further information. - -import glob - - from sos.plugins import Plugin, RedHatPlugin diff --git a/sos/plugins/postgresql.py b/sos/plugins/postgresql.py index aef431f8..ebd7863a 100644 --- a/sos/plugins/postgresql.py +++ b/sos/plugins/postgresql.py @@ -13,10 +13,8 @@ # See the LICENSE file in the source distribution for further information. import os -import tempfile -from sos.plugins import (Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin, - SCLPlugin) +from sos.plugins import (Plugin, UbuntuPlugin, DebianPlugin, SCLPlugin) from sos.utilities import find diff --git a/sos/plugins/symcli.py b/sos/plugins/symcli.py index be9322b7..fda58197 100644 --- a/sos/plugins/symcli.py +++ b/sos/plugins/symcli.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.plugins import Plugin, RedHatPlugin, os +from sos.plugins import Plugin, RedHatPlugin from sos.utilities import is_executable diff --git a/sos/plugins/virsh.py b/sos/plugins/virsh.py index d33b4b28..d4b8032c 100644 --- a/sos/plugins/virsh.py +++ b/sos/plugins/virsh.py @@ -7,8 +7,6 @@ # See the LICENSE file in the source distribution for further information. from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin -import glob -import os class LibvirtClient(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): diff --git a/sos/plugins/xen.py b/sos/plugins/xen.py index ace6c362..eef4e38a 100644 --- a/sos/plugins/xen.py +++ b/sos/plugins/xen.py @@ -9,7 +9,6 @@ from sos.plugins import Plugin, RedHatPlugin import os import re -from stat import * class Xen(Plugin, RedHatPlugin): diff --git a/sos/policies/redhat.py b/sos/policies/redhat.py index 15915dc3..3a759eda 100644 --- a/sos/policies/redhat.py +++ b/sos/policies/redhat.py @@ -22,7 +22,6 @@ from sos import SoSOptions sys.path.insert(0, "/usr/share/rhn/") try: from up2date_client import up2dateAuth - from up2date_client import config from rhn import rpclib except ImportError: # might fail if non-RHEL @@ -314,7 +313,6 @@ support representative. def rhn_username(self): try: - # cfg = config.initUp2dateConfig() rhn_username = rpclib.xmlrpclib.loads( up2dateAuth.getSystemId())[0][0]['username'] return rhn_username.encode('utf-8', 'ignore') diff --git a/sos/sosreport.py b/sos/sosreport.py index 0d8a42ce..0845f9f2 100644 --- a/sos/sosreport.py +++ b/sos/sosreport.py @@ -32,7 +32,7 @@ import pdb from sos import _sos as _ from sos import __version__ -from sos import _arg_names, _arg_defaults, SoSOptions +from sos import _arg_defaults, SoSOptions import sos.policies from sos.archive import TarFileArchive from sos.reporting import (Report, Section, Command, CopiedFile, CreatedFile, |