Merge branch 'pyflakes-remove-unused-imports'

Conflicts:
	sos/plugins/as7.py
	sos/plugins/jboss.py
	sos/plugins/soundcard.py

35 files changed, 6 insertions, 44 deletions

diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py
index e78f86af..f41964cb 100644
--- a/sos/plugins/__init__.py
+++ b/sos/plugins/__init__.py
@@ -26,15 +26,10 @@
 from __future__ import with_statement
 
 from sos.utilities import sos_get_command_output, import_module, grep, fileobj, tail
-from sos import _sos as _
-import inspect
 import os
-import sys
-import string
 import glob
 import re
 import traceback
-import shutil
 from stat import *
 from time import time
 from itertools import *
diff --git a/sos/plugins/autofs.py b/sos/plugins/autofs.py
index f88d4f8b..b1d264ba 100644
--- a/sos/plugins/autofs.py
+++ b/sos/plugins/autofs.py
@@ -15,7 +15,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin
-import os, re
 
 class Autofs(Plugin):
     """autofs server-related information
diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py
index 07eeb458..e31a295b 100644
--- a/sos/plugins/cluster.py
+++ b/sos/plugins/cluster.py
@@ -13,7 +13,7 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-import os, re
+import re
 from glob import glob
 
 class Cluster(Plugin, RedHatPlugin):
diff --git a/sos/plugins/ftp.py b/sos/plugins/ftp.py
index 7dc4676d..693b8cbd 100644
--- a/sos/plugins/ftp.py
+++ b/sos/plugins/ftp.py
@@ -13,7 +13,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-from os.path import exists
 
 class ftp(Plugin, RedHatPlugin):
     """FTP server related information
diff --git a/sos/plugins/ipa.py b/sos/plugins/ipa.py
index 1adbe162..3bbf71cd 100644
--- a/sos/plugins/ipa.py
+++ b/sos/plugins/ipa.py
@@ -15,7 +15,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-from os.path import exists
 
 class Ipa(Plugin, RedHatPlugin):
     """IPA diagnostic information
diff --git a/sos/plugins/iscsi.py b/sos/plugins/iscsi.py
index 22e37bd7..2a49ee4c 100644
--- a/sos/plugins/iscsi.py
+++ b/sos/plugins/iscsi.py
@@ -13,7 +13,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+from sos.plugins import Plugin, RedHatPlugin
 
 class Iscsi(Plugin):
     """iscsi-initiator related information
diff --git a/sos/plugins/kdump.py b/sos/plugins/kdump.py
index 6cd7e89d..ebe17ede 100644
--- a/sos/plugins/kdump.py
+++ b/sos/plugins/kdump.py
@@ -13,7 +13,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
-from os.path import exists
 
 class kdump(Plugin):
     """Kdump related information
diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py
index 3b44e7f6..4ebf3575 100644
--- a/sos/plugins/kernel.py
+++ b/sos/plugins/kernel.py
@@ -13,7 +13,7 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
-import os, re
+import os
 
 class kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """kernel related information
diff --git a/sos/plugins/landscape.py b/sos/plugins/landscape.py
index f544ebb7..c31dea70 100644
--- a/sos/plugins/landscape.py
+++ b/sos/plugins/landscape.py
@@ -13,7 +13,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, UbuntuPlugin
-import os
 
 class Landscape(Plugin, UbuntuPlugin):
     """
@@ -69,4 +68,4 @@ class Landscape(Plugin, UbuntuPlugin):
         r"registration_password[***]"
         )
         
-                                                    
\ No newline at end of file
+                                                    
diff --git a/sos/plugins/ldap.py b/sos/plugins/ldap.py
index dff5d625..211c1429 100644
--- a/sos/plugins/ldap.py
+++ b/sos/plugins/ldap.py
@@ -13,7 +13,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-import os
 
 class ldap(Plugin, RedHatPlugin):
     """LDAP related information
diff --git a/sos/plugins/lsbrelease.py b/sos/plugins/lsbrelease.py
index eee68e16..aa3b2888 100644
--- a/sos/plugins/lsbrelease.py
+++ b/sos/plugins/lsbrelease.py
@@ -14,7 +14,6 @@
 
 
 from sos.plugins import Plugin, RedHatPlugin
-import os
 
 class lsbrelease(Plugin, RedHatPlugin):
     """Linux Standard Base information
diff --git a/sos/plugins/mysql.py b/sos/plugins/mysql.py
index 1437c162..3a3fdbdd 100644
--- a/sos/plugins/mysql.py
+++ b/sos/plugins/mysql.py
@@ -13,7 +13,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-from os.path import exists
 
 class mysql(Plugin, RedHatPlugin):
     """MySQL related information
diff --git a/sos/plugins/named.py b/sos/plugins/named.py
index 812e20da..99f950f4 100644
--- a/sos/plugins/named.py
+++ b/sos/plugins/named.py
@@ -13,7 +13,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-import commands
 from os.path import normpath, join, exists
 
 class named(Plugin, RedHatPlugin):
diff --git a/sos/plugins/netdump.py b/sos/plugins/netdump.py
index 235dd5f7..964e14e8 100644
--- a/sos/plugins/netdump.py
+++ b/sos/plugins/netdump.py
@@ -13,7 +13,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-from os.path import exists
 
 class netdump(Plugin, RedHatPlugin):
     """Netdump Configuration Information
diff --git a/sos/plugins/nis.py b/sos/plugins/nis.py
index 4f4d6258..573581e8 100644
--- a/sos/plugins/nis.py
+++ b/sos/plugins/nis.py
@@ -16,7 +16,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-import os
 
 class nis(Plugin, RedHatPlugin):
     """NIS related information
diff --git a/sos/plugins/openswan.py b/sos/plugins/openswan.py
index d57a8db6..2c4a1c01 100644
--- a/sos/plugins/openswan.py
+++ b/sos/plugins/openswan.py
@@ -15,7 +15,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-from os.path import exists
 
 class openswan(Plugin, RedHatPlugin):
     """ipsec related information
diff --git a/sos/plugins/postfix.py b/sos/plugins/postfix.py
index d2c3c8fc..87857553 100644
--- a/sos/plugins/postfix.py
+++ b/sos/plugins/postfix.py
@@ -13,7 +13,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-from os.path import exists
 
 class postfix(Plugin, RedHatPlugin):
     """mail server related information
diff --git a/sos/plugins/postgresql.py b/sos/plugins/postgresql.py
index 084d70a7..0a8e5ac3 100644
--- a/sos/plugins/postgresql.py
+++ b/sos/plugins/postgresql.py
@@ -1,7 +1,4 @@
 import os
-import fnmatch
-import shlex
-import subprocess
 import tempfile
 
 from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin
diff --git a/sos/plugins/ppp.py b/sos/plugins/ppp.py
index 207071c5..76e44046 100644
--- a/sos/plugins/ppp.py
+++ b/sos/plugins/ppp.py
@@ -15,7 +15,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-from os.path import exists
 
 class ppp(Plugin, RedHatPlugin):
     """ppp, wvdial and rp-pppoe related information
diff --git a/sos/plugins/process.py b/sos/plugins/process.py
index 2b3faff9..3b06c7c4 100644
--- a/sos/plugins/process.py
+++ b/sos/plugins/process.py
@@ -13,7 +13,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
-import time
 import os
 
 class Process(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
diff --git a/sos/plugins/pxe.py b/sos/plugins/pxe.py
index 082db155..08810c22 100644
--- a/sos/plugins/pxe.py
+++ b/sos/plugins/pxe.py
@@ -13,7 +13,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-from os.path import exists
 
 class pxe(Plugin, RedHatPlugin):
     """PXE related information
diff --git a/sos/plugins/quagga.py b/sos/plugins/quagga.py
index 28ba983f..703b4a54 100644
--- a/sos/plugins/quagga.py
+++ b/sos/plugins/quagga.py
@@ -15,7 +15,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-from os.path import exists
 
 class quagga(Plugin, RedHatPlugin):
     """quagga related information
diff --git a/sos/plugins/radius.py b/sos/plugins/radius.py
index 972b179c..e814526e 100644
--- a/sos/plugins/radius.py
+++ b/sos/plugins/radius.py
@@ -15,7 +15,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
-from os.path import exists
 
 class radius(Plugin):
     """radius related information
diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py
index 26698ebc..82164a4d 100644
--- a/sos/plugins/s390.py
+++ b/sos/plugins/s390.py
@@ -14,7 +14,6 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-import os
 from sos.plugins import Plugin, RedHatPlugin
 
 class s390(Plugin, RedHatPlugin):
diff --git a/sos/plugins/sendmail.py b/sos/plugins/sendmail.py
index 1b52a6af..61315a27 100644
--- a/sos/plugins/sendmail.py
+++ b/sos/plugins/sendmail.py
@@ -15,7 +15,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-from os.path import exists
 
 class sendmail(Plugin, RedHatPlugin):
     """sendmail information
diff --git a/sos/plugins/smartcard.py b/sos/plugins/smartcard.py
index 6975b0aa..969aa611 100644
--- a/sos/plugins/smartcard.py
+++ b/sos/plugins/smartcard.py
@@ -15,8 +15,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-import os
-from time import time
 
 class smartcard(Plugin, RedHatPlugin):
     """Smart Card related information
diff --git a/sos/plugins/snmp.py b/sos/plugins/snmp.py
index 63aac8e6..ec438dfb 100644
--- a/sos/plugins/snmp.py
+++ b/sos/plugins/snmp.py
@@ -15,7 +15,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-from os.path import exists
 
 class snmp(Plugin, RedHatPlugin):
     """snmp related information
diff --git a/sos/plugins/soundcard.py b/sos/plugins/soundcard.py
index 0aec3282..b92b4c51 100644
--- a/sos/plugins/soundcard.py
+++ b/sos/plugins/soundcard.py
@@ -15,7 +15,6 @@
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 import os
 
-
 class Soundcard(Plugin):
     """ Sound card information
     """
diff --git a/sos/plugins/squid.py b/sos/plugins/squid.py
index a83c45a1..dae5759f 100644
--- a/sos/plugins/squid.py
+++ b/sos/plugins/squid.py
@@ -13,7 +13,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
-import os
 
 class squid(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """squid related information
diff --git a/sos/plugins/sunrpc.py b/sos/plugins/sunrpc.py
index 12277513..dff6ed80 100644
--- a/sos/plugins/sunrpc.py
+++ b/sos/plugins/sunrpc.py
@@ -14,7 +14,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
+from sos.plugins import Plugin, RedHatPlugin
 
 class sunrpc(Plugin):
     """Sun RPC related information
diff --git a/sos/plugins/systemd.py b/sos/plugins/systemd.py
index 84a3e759..046fb227 100644
--- a/sos/plugins/systemd.py
+++ b/sos/plugins/systemd.py
@@ -14,8 +14,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
-import os
+from sos.plugins import Plugin, RedHatPlugin
 
 class systemd(Plugin, RedHatPlugin):
     """ Information on systemd and related subsystems
diff --git a/sos/plugins/tftpserver.py b/sos/plugins/tftpserver.py
index 29324e42..4a4018f4 100644
--- a/sos/plugins/tftpserver.py
+++ b/sos/plugins/tftpserver.py
@@ -15,7 +15,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-from os.path import exists
 
 class tftpserver(Plugin, RedHatPlugin):
     """tftpserver related information
diff --git a/sos/plugins/vmware.py b/sos/plugins/vmware.py
index 7e102c73..d7d39f82 100644
--- a/sos/plugins/vmware.py
+++ b/sos/plugins/vmware.py
@@ -13,7 +13,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-from os.path import exists
 
 class vmware(Plugin, RedHatPlugin):
     """VMWare related information
diff --git a/sos/plugins/xinetd.py b/sos/plugins/xinetd.py
index 0a8833e8..8c3945e0 100644
--- a/sos/plugins/xinetd.py
+++ b/sos/plugins/xinetd.py
@@ -15,7 +15,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
-import os
 
 class Xinetd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """xinetd information
diff --git a/sos/plugins/yum.py b/sos/plugins/yum.py
index d691c43c..18519df3 100644
--- a/sos/plugins/yum.py
+++ b/sos/plugins/yum.py
@@ -13,7 +13,6 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from sos.plugins import Plugin, RedHatPlugin
-import os
 
 class Yum(Plugin, RedHatPlugin):
     """yum information