[plugins] removed empty returns

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@1019 ef72aa8b-4018-0410-8976-d6e080ef94d8

77 files changed, 2 insertions, 138 deletions

diff --git a/sos/plugins/abrt.py b/sos/plugins/abrt.py
index 55f2a9d4..22637a87 100644
--- a/sos/plugins/abrt.py
+++ b/sos/plugins/abrt.py
@@ -41,4 +41,3 @@ class abrt(sos.plugintools.PluginBase):
                 suggest_filename="abrt-log")
         if self.getOption('backtraces'):
             self.do_backtraces()
-        return
diff --git a/sos/plugins/acpid.py b/sos/plugins/acpid.py
index 7e94e650..ab452b29 100644
--- a/sos/plugins/acpid.py
+++ b/sos/plugins/acpid.py
@@ -20,5 +20,3 @@ class acpid(sos.plugintools.PluginBase):
     def setup(self):
         self.addCopySpec("/var/log/acpid*")
         self.addCopySpec("/etc/acpi/events/power.conf")
-        return
-
diff --git a/sos/plugins/amd.py b/sos/plugins/amd.py
index a3bc6602..b0c7d346 100644
--- a/sos/plugins/amd.py
+++ b/sos/plugins/amd.py
@@ -31,5 +31,3 @@ class amd(sos.plugintools.PluginBase):
         self.collectExtOutput("/bin/rpm -qV am-utils")
         self.collectExtOutput("/bin/egrep -e 'automount|pid.*nfs' /proc/mounts")
         self.collectExtOutput("/bin/mount | egrep -e 'automount|pid.*nfs'")
-        return
-
diff --git a/sos/plugins/anaconda.py b/sos/plugins/anaconda.py
index 8c8c3f0c..4d4ae9c6 100644
--- a/sos/plugins/anaconda.py
+++ b/sos/plugins/anaconda.py
@@ -28,5 +28,3 @@ class anaconda(sos.plugintools.PluginBase):
         self.addCopySpec("/var/log/anaconda.log")
         self.addCopySpec("/var/log/anaconda.syslog")
         self.addCopySpec("/var/log/anaconda.xlog")
-        return
-
diff --git a/sos/plugins/apache.py b/sos/plugins/apache.py
index bae93562..4cde3f60 100644
--- a/sos/plugins/apache.py
+++ b/sos/plugins/apache.py
@@ -24,5 +24,3 @@ class apache(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/httpd/conf.d/*.conf")
         if self.getOption("log"):
             self.addCopySpec("/var/log/httpd/*")
-        return
-
diff --git a/sos/plugins/auditd.py b/sos/plugins/auditd.py
index 7dd4cad8..53b35541 100644
--- a/sos/plugins/auditd.py
+++ b/sos/plugins/auditd.py
@@ -24,4 +24,3 @@ class auditd(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/audit/auditd.conf")
         self.addCopySpec("/etc/audit/audit.rules")
         self.addCopySpecLimit("/var/log/audit*", sizelimit = self.getOption("syslogsize"))
-        return
diff --git a/sos/plugins/autofs.py b/sos/plugins/autofs.py
index ece4e88d..2026089d 100644
--- a/sos/plugins/autofs.py
+++ b/sos/plugins/autofs.py
@@ -55,5 +55,3 @@ class autofs(sos.plugintools.PluginBase):
         self.collectExtOutput("LC_ALL=C /sbin/chkconfig --list autofs")
         if self.checkdebug():
             self.addCopySpec(self.getdaemondebug())
-        return
-
diff --git a/sos/plugins/bootloader.py b/sos/plugins/bootloader.py
index 5eb811cd..40a80cb4 100644
--- a/sos/plugins/bootloader.py
+++ b/sos/plugins/bootloader.py
@@ -28,5 +28,3 @@ class bootloader(sos.plugintools.PluginBase):
         
         self.collectExtOutput("/sbin/lilo -q")
         self.collectExtOutput("/bin/ls -laR /boot")
-        return
-
diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py
index 78f9d42f..b9c8145b 100644
--- a/sos/plugins/cluster.py
+++ b/sos/plugins/cluster.py
@@ -254,8 +254,6 @@ class cluster(sos.plugintools.PluginBase):
         if self.getOption('gfslockdump'): self.do_gfslockdump()
         if self.getOption('lockdump'): self.do_lockdump()
 
-        return
-
     def do_lockdump(self):
         status, output, time= self.callExtProg("cman_tool services")
         if status:
diff --git a/sos/plugins/cobbler.py b/sos/plugins/cobbler.py
index 11ff8499..c1a05147 100644
--- a/sos/plugins/cobbler.py
+++ b/sos/plugins/cobbler.py
@@ -25,4 +25,3 @@ class cobbler(sos.plugintools.PluginBase):
         self.addCopySpec("/var/log/cobbler")
         self.addCopySpec("/var/lib/rhn/kickstarts") 
         self.addCopySpec("/var/lib/cobbler")
-        return
diff --git a/sos/plugins/crontab.py b/sos/plugins/crontab.py
index 8ad4c232..191b13f5 100644
--- a/sos/plugins/crontab.py
+++ b/sos/plugins/crontab.py
@@ -24,4 +24,3 @@ class crontab(sos.plugintools.PluginBase):
         self.collectExtOutput("""for i in `ls /home/`;\
         do echo "User :" $i;/usr/bin/crontab -l -u $i;\
         echo "---------------";done""", suggest_filename = "users_crontabs")
-        return
diff --git a/sos/plugins/cs.py b/sos/plugins/cs.py
index 93f5bc16..9b8a9569 100644
--- a/sos/plugins/cs.py
+++ b/sos/plugins/cs.py
@@ -81,4 +81,3 @@ class cs(sos.plugintools.PluginBase):
             self.addCopySpec("/var/log/pki-*/ra-debug.log")
             self.addCopySpec("/var/log/pki-*/transactions")
             self.addCopySpec("/var/log/pki-*/system")
-        return
diff --git a/sos/plugins/devicemapper.py b/sos/plugins/devicemapper.py
index d1795352..69c82952 100644
--- a/sos/plugins/devicemapper.py
+++ b/sos/plugins/devicemapper.py
@@ -62,5 +62,3 @@ class devicemapper(sos.plugintools.PluginBase):
               self.collectExtOutput("/usr/bin/udevinfo -ap /sys/block/%s" % (disk))
         for opt in self.dmraidOptions:
             self.collectExtOutput("/sbin/dmraid -%s" % (opt,))
-
-        return
diff --git a/sos/plugins/dhcp.py b/sos/plugins/dhcp.py
index 872377cf..336f10ea 100644
--- a/sos/plugins/dhcp.py
+++ b/sos/plugins/dhcp.py
@@ -26,4 +26,3 @@ class dhcp(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/sysconfig/dhcrelay")
         self.addCopySpec("/etc/sysconfig/dhcpd")
         self.addCopySpec("/etc/dhcpd.conf")
-        return
diff --git a/sos/plugins/dovecot.py b/sos/plugins/dovecot.py
index 553ff3e1..9c201cea 100644
--- a/sos/plugins/dovecot.py
+++ b/sos/plugins/dovecot.py
@@ -22,5 +22,3 @@ class dovecot(sos.plugintools.PluginBase):
         if os.path.exists("/etc/dovecot.conf"):
             self.addCopySpec("/etc/dovecot*")
             self.collectExtOutput("/usr/sbin/dovecot -n")
-        return
-
diff --git a/sos/plugins/ds.py b/sos/plugins/ds.py
index 49ec7e86..979a8dd5 100644
--- a/sos/plugins/ds.py
+++ b/sos/plugins/ds.py
@@ -48,5 +48,3 @@ class ds(sos.plugintools.PluginBase):
         elif "ds7" in self.check_version():
             self.addCopySpec("/opt/redhat-ds/slapd-*/config")
             self.addCopySpec("/opt/redhat-ds/slapd-*/logs")
-        return
-
diff --git a/sos/plugins/emc.py b/sos/plugins/emc.py
index 4e9959aa..6c9fd2c4 100644
--- a/sos/plugins/emc.py
+++ b/sos/plugins/emc.py
@@ -32,7 +32,6 @@ class emc(sos.plugintools.PluginBase):
         self.addCustomText("the way they compete and create value from their information.  ")
         self.addCustomText("Information about EMC's products and services can be found at ")
         self.addCustomText('<a href="http://www.EMC.com/">www.EMC.com</a>.</center>')
-        return
 
     def get_pp_files(self):
         """ EMC PowerPath specific information - files
@@ -47,7 +46,6 @@ class emc(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/emcp_devicesDB.idx")
         self.addCopySpec("/etc/emc/powerkmd.custom")
         self.addCopySpec("/etc/modprobe.conf.pp")
-        return
 
     def get_pp_config(self):
         """ EMC PowerPath specific information - commands
@@ -59,7 +57,6 @@ class emc(sos.plugintools.PluginBase):
         self.collectExtOutput("/sbin/powermt display ports")
         self.collectExtOutput("/sbin/powermt display paths")
         self.collectExtOutput("/sbin/powermt dump")
-        return
 
     def get_symcli_files(self):
         """ EMC Solutions Enabler SYMCLI specific information - files
@@ -67,7 +64,6 @@ class emc(sos.plugintools.PluginBase):
         self.addCopySpec("/var/symapi/db/symapi_db.bin")
         self.addCopySpec("/var/symapi/config/[a-z]*")
         self.addCopySpec("/var/symapi/log/[a-z]*")
-        return
 
     def get_symcli_config(self):
         """ EMC Solutions Enabler SYMCLI specific information - Symmetrix/DMX - commands
@@ -117,7 +113,6 @@ class emc(sos.plugintools.PluginBase):
         self.collectExtOutput("/usr/symcli/bin/symmask list logins")
         self.collectExtOutput("/usr/symcli/bin/symmaskdb list database")
         self.collectExtOutput("/usr/symcli/bin/symmaskdb -v list database")
-        return
 
     def get_navicli_config(self):
         """ EMC Navisphere Host Agent NAVICLI specific information - files
@@ -127,7 +122,6 @@ class emc(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/Navisphere/Quietmode.cfg")
         self.addCopySpec("/etc/Navisphere/messages/[a-z]*")
         self.addCopySpec("/etc/Navisphere/log/[a-z]*")
-        return
 
     def get_navicli_SP_info(self,SP_address):
         """ EMC Navisphere Host Agent NAVICLI specific information - CLARiiON - commands
@@ -145,7 +139,6 @@ class emc(sos.plugintools.PluginBase):
         self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s port -list -all" % SP_address)
         self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s storagegroup -list" % SP_address)
         self.collectExtOutput("/opt/Navisphere/bin/navicli -h %s spportspeed -get" % SP_address)
-        return
 
     def checkenabled(self):
         self.packages = [ "EMCpower" ]
@@ -222,4 +215,3 @@ class emc(sos.plugintools.PluginBase):
         ## Only provide About EMC if EMC products are installed
         if add_about_emc != "no":
             self.about_emc()
-        return
diff --git a/sos/plugins/filesys.py b/sos/plugins/filesys.py
index a84a9c3e..18e0ed59 100644
--- a/sos/plugins/filesys.py
+++ b/sos/plugins/filesys.py
@@ -72,5 +72,3 @@ class filesys(sos.plugintools.PluginBase):
         if self.getOption('dumpe2fs'):
             for extfs in izip(self.doRegexFindAll(r"^(/dev/.+) on .+ type ext.\s+", mounts)):
                 self.collectExtOutput("/sbin/dumpe2fs %s" % (extfs))
-        return
-
diff --git a/sos/plugins/ftp.py b/sos/plugins/ftp.py
index 6afc9260..e5914e78 100644
--- a/sos/plugins/ftp.py
+++ b/sos/plugins/ftp.py
@@ -25,5 +25,3 @@ class ftp(sos.plugintools.PluginBase):
     def setup(self):
         self.addCopySpec("/etc/ftp*")
         self.addCopySpec("/etc/vsftpd")
-        return
-
diff --git a/sos/plugins/gdm.py b/sos/plugins/gdm.py
index bf75ea33..62207c0e 100644
--- a/sos/plugins/gdm.py
+++ b/sos/plugins/gdm.py
@@ -19,4 +19,3 @@ class gdm(sos.plugintools.PluginBase):
     """
     def setup(self):
         self.addCopySpec("/etc/gdm/*")
-        return 
diff --git a/sos/plugins/general.py b/sos/plugins/general.py
index 7c5b1d30..a165c8d2 100644
--- a/sos/plugins/general.py
+++ b/sos/plugins/general.py
@@ -66,8 +66,5 @@ class general(sos.plugintools.PluginBase):
                     if not os.path.isfile(i): continue
                     self.addCopySpec(i)
 
-        return
-
     def postproc(self):
         self.doRegexSub("/etc/sysconfig/rhn/up2date", r"(\s*proxyPassword\s*=\s*)\S+", r"\1***")
-        return
diff --git a/sos/plugins/hardware.py b/sos/plugins/hardware.py
index 2d70f774..c6ecf4b1 100644
--- a/sos/plugins/hardware.py
+++ b/sos/plugins/hardware.py
@@ -48,5 +48,3 @@ class hardware(sos.plugintools.PluginBase):
         self.collectExtOutput("/usr/bin/lshal")
         self.collectExtOutput("/usr/bin/systool -c fc_host -v")
         self.collectExtOutput("/usr/bin/systool -c scsi_host -v")
-        return
-
diff --git a/sos/plugins/hts.py b/sos/plugins/hts.py
index 4d5cf652..10af675d 100644
--- a/sos/plugins/hts.py
+++ b/sos/plugins/hts.py
@@ -20,4 +20,3 @@ class hts(sos.plugintools.PluginBase):
     def setup(self):
         self.addCopySpec("/etc/httpd/conf.d/hts.conf")
         self.addCopySpec("/var/hts")
-        return
diff --git a/sos/plugins/i18n.py b/sos/plugins/i18n.py
index 0a793d0f..a84a17ce 100644
--- a/sos/plugins/i18n.py
+++ b/sos/plugins/i18n.py
@@ -22,5 +22,3 @@ class i18n(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/sysconfig/i18n")
         self.addCopySpec("/etc/X11/xinit/xinput.d/*")
 	self.collectExtOutput("/usr/bin/locale")
-        return
-
diff --git a/sos/plugins/initrd.py b/sos/plugins/initrd.py
index 7bd7e1f3..899cccf8 100644
--- a/sos/plugins/initrd.py
+++ b/sos/plugins/initrd.py
@@ -22,7 +22,6 @@ class initrd(sos.plugintools.PluginBase):
         for initrd in glob.glob('/boot/initrd-*.img'):
             self.collectExtOutput("/bin/zcat "+initrd+" | /bin/cpio "+
                 "--extract --to-stdout init" )
-        return
 
     def defaultenabled(self):
         return False
diff --git a/sos/plugins/ipa.py b/sos/plugins/ipa.py
index cc35ad38..f315dcba 100644
--- a/sos/plugins/ipa.py
+++ b/sos/plugins/ipa.py
@@ -31,5 +31,3 @@ class ipa(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/ipa/ipa.conf")
         self.addCopySpec("/etc/krb5.conf")
         self.addCopySpec("/etc/krb5.keytab")
-        return
-
diff --git a/sos/plugins/ipsec.py b/sos/plugins/ipsec.py
index e4d2f7ae..82c8a431 100644
--- a/sos/plugins/ipsec.py
+++ b/sos/plugins/ipsec.py
@@ -25,4 +25,3 @@ class ipsec(sos.plugintools.PluginBase):
 
     def setup(self):
         self.addCopySpec("/etc/racoon")
-        return
diff --git a/sos/plugins/iscsi.py b/sos/plugins/iscsi.py
index 1b4ce67d..39e3fb4a 100644
--- a/sos/plugins/iscsi.py
+++ b/sos/plugins/iscsi.py
@@ -21,4 +21,3 @@ class iscsi(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/iscsi/iscsid.conf")
         self.addCopySpec("/etc/iscsi/initiatorname.iscsi")
         self.addCopySpec("/var/lib/iscsi")
-        return
diff --git a/sos/plugins/kdump.py b/sos/plugins/kdump.py
index 6aacefca..58fd142c 100644
--- a/sos/plugins/kdump.py
+++ b/sos/plugins/kdump.py
@@ -26,4 +26,3 @@ class kdump(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/sysconfig/kdump")
         self.addCopySpec("/proc/cmdline")
         self.addCopySpec("/etc/udev/rules.d/*kexec.rules")
-        return
diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py
index 25af8b98..882577b5 100644
--- a/sos/plugins/kernel.py
+++ b/sos/plugins/kernel.py
@@ -73,8 +73,6 @@ class kernel(sos.plugintools.PluginBase):
         self.addCopySpec("/proc/sys/kernel/tainted")
         self.addCopySpec("/proc/buddyinfo")
 
-        return
-
     def diagnose(self):
 
         infd = open("/proc/modules", "r")
@@ -117,4 +115,3 @@ class kernel(sos.plugintools.PluginBase):
                     # found a taint match, create an alert
                     moduleName = line.split()[0]
                     self.addAlert("Check for tainted kernel by module %s, which is %s" % (moduleName, tainter['description']))
-        return
diff --git a/sos/plugins/kvm.py b/sos/plugins/kvm.py
index c6cbfcef..111bcf97 100644
--- a/sos/plugins/kvm.py
+++ b/sos/plugins/kvm.py
@@ -40,10 +40,7 @@ class kvm(sos.plugintools.PluginBase):
         if self.getOption('topOutput'):
             self.collectExtOutput("/usr/bin/top -b -d 1 -n 5")
         self.collectExtOutput("/usr/bin/kvm_stat --once")
-        return
 
     def postproc(self):
         if self._debugfs_cleanup and os.path.ismount("/sys/kernel/debug"):
             os.popen("umount /sys/kernel/debug")
-        return
-
diff --git a/sos/plugins/ldap.py b/sos/plugins/ldap.py
index b1a48420..09d7f6ba 100644
--- a/sos/plugins/ldap.py
+++ b/sos/plugins/ldap.py
@@ -47,4 +47,3 @@ class ldap(sos.plugintools.PluginBase):
 
     def postproc(self):
         self.doRegexSub("/etc/ldap.conf", r"(\s*bindpw\s*)\S+", r"\1***")
-        return
diff --git a/sos/plugins/libraries.py b/sos/plugins/libraries.py
index b44b81bd..402c9dbb 100644
--- a/sos/plugins/libraries.py
+++ b/sos/plugins/libraries.py
@@ -27,5 +27,3 @@ class libraries(sos.plugintools.PluginBase):
         if self.getOption("ldconfigv"):
             self.collectExtOutput("/sbin/ldconfig -v -N -X")
         self.collectExtOutput("/sbin/ldconfig -p -N -X")
-        return
-
diff --git a/sos/plugins/logrotate.py b/sos/plugins/logrotate.py
index f3195d0e..138e303d 100644
--- a/sos/plugins/logrotate.py
+++ b/sos/plugins/logrotate.py
@@ -24,4 +24,3 @@ class logrotate(sos.plugintools.PluginBase):
         self.collectExtOutput("/bin/cat /var/lib/logrotate.status",
                               suggest_filename = "logrotate_status")
         self.addCopySpec("/etc/logrotate*")
-        return
diff --git a/sos/plugins/lsbrelease.py b/sos/plugins/lsbrelease.py
index 78a83577..7a58a024 100644
--- a/sos/plugins/lsbrelease.py
+++ b/sos/plugins/lsbrelease.py
@@ -22,9 +22,8 @@ class lsbrelease(sos.plugintools.PluginBase):
     def diagnose(self):
         if not os.path.exists("/etc/redhat-release"):
             self.addDiagnose("/etc/redhat-release missing")
-            return
+
     def setup(self):
         self.collectExtOutput("/usr/bin/lsb_release -a")
         self.collectExtOutput("/usr/bin/lsb_release -d", suggest_filename = "lsb_release", root_symlink = "lsb-release")
         self.addCopySpec("/etc/lsb-release*")
-        return    
diff --git a/sos/plugins/memory.py b/sos/plugins/memory.py
index 7fbe39c3..330fa734 100644
--- a/sos/plugins/memory.py
+++ b/sos/plugins/memory.py
@@ -26,5 +26,3 @@ class memory(sos.plugintools.PluginBase):
         self.collectExtOutput("/bin/dmesg | grep -e 'e820.' -e 'aperature.'")
         self.collectExtOutput("/usr/bin/free", root_symlink = "free")
         self.collectExtOutput("/usr/bin/free -m")
-        return
-
diff --git a/sos/plugins/mrggrid.py b/sos/plugins/mrggrid.py
index 2b39ab17..54e1d6a4 100644
--- a/sos/plugins/mrggrid.py
+++ b/sos/plugins/mrggrid.py
@@ -20,4 +20,3 @@ class mrggrid(sos.plugintools.PluginBase):
     def setup(self):
         self.addCopySpec("/etc/condor/condor_config")
         self.addCopySpec("/usr/bin/condor_status")
-        return
diff --git a/sos/plugins/mrgmessg.py b/sos/plugins/mrgmessg.py
index 481083ad..9f957990 100644
--- a/sos/plugins/mrgmessg.py
+++ b/sos/plugins/mrgmessg.py
@@ -21,4 +21,3 @@ class mrgmessg(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/qpidd.conf")
         self.addCopySpec("/etc/sasl2/qpidd.conf")
         self.addCopySpec("/var/rhm")
-        return
diff --git a/sos/plugins/mysql.py b/sos/plugins/mysql.py
index 22cb6cb0..5fd45e23 100644
--- a/sos/plugins/mysql.py
+++ b/sos/plugins/mysql.py
@@ -29,4 +29,3 @@ class mysql(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/sysconfig/network")
         self.addCopySpec("/etc/ld.so.conf.d/mysql*")
         self.addCopySpec("/var/log/mysql*")
-        return
diff --git a/sos/plugins/named.py b/sos/plugins/named.py
index 53f81705..6710a165 100644
--- a/sos/plugins/named.py
+++ b/sos/plugins/named.py
@@ -41,4 +41,3 @@ class named(sos.plugintools.PluginBase):
                 self.addForbiddenPath(join(self.getDnsDir(cfg),"chroot/dev"))
                 self.addForbiddenPath(join(self.getDnsDir(cfg),"chroot/proc"))
         self.addCopySpec("/etc/sysconfig/named")
-        return
diff --git a/sos/plugins/netdump.py b/sos/plugins/netdump.py
index abe13a07..1dcbc0f0 100644
--- a/sos/plugins/netdump.py
+++ b/sos/plugins/netdump.py
@@ -23,4 +23,3 @@ class netdump(sos.plugintools.PluginBase):
 
     def setup(self):
         self.addCopySpec("/etc/sysconfig/netdump")
-        return
diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py
index cc619550..9dd096dc 100644
--- a/sos/plugins/networking.py
+++ b/sos/plugins/networking.py
@@ -74,6 +74,3 @@ class networking(sos.plugintools.PluginBase):
                 self.collectExtOutput("/sbin/ethtool -S "+eth)
         if self.getOption("traceroute"):
             self.collectExtOutput("/bin/traceroute -n rhn.redhat.com")
-            
-        return
-
diff --git a/sos/plugins/nfsserver.py b/sos/plugins/nfsserver.py
index 2a3c3af5..2201e41b 100644
--- a/sos/plugins/nfsserver.py
+++ b/sos/plugins/nfsserver.py
@@ -40,4 +40,3 @@ class nfsserver(sos.plugintools.PluginBase):
         self.addCopySpec("/var/lib/nfs/rmtab")
         self.collectExtOutput("/usr/sbin/rpcinfo -p localhost")
         self.collectExtOutput("/usr/sbin/nfsstat -a")
-        return
diff --git a/sos/plugins/nscd.py b/sos/plugins/nscd.py
index ee9f2e25..8ae28878 100644
--- a/sos/plugins/nscd.py
+++ b/sos/plugins/nscd.py
@@ -36,6 +36,3 @@ class nscd(sos.plugintools.PluginBase):
                 f = o.split()
                 self.addCopySpecLimit(f[1],
                     sizelimit = self.isOptionEnabled("nscdlogsize"))
-
-        return
-
diff --git a/sos/plugins/ntp.py b/sos/plugins/ntp.py
index 2a694e97..f3010ae4 100644
--- a/sos/plugins/ntp.py
+++ b/sos/plugins/ntp.py
@@ -20,4 +20,3 @@ class ntp(sos.plugintools.PluginBase):
     def setup(self):
         self.collectExtOutput("/usr/bin/ntpstat")
         self.collectExtOutput("/usr/sbin/ntptrace -n")
-        return
diff --git a/sos/plugins/pam.py b/sos/plugins/pam.py
index 1a50811b..7c57ee8d 100644
--- a/sos/plugins/pam.py
+++ b/sos/plugins/pam.py
@@ -21,5 +21,3 @@ class pam(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/pam.d")
         self.addCopySpec("/etc/security")
         self.collectExtOutput("/bin/ls -laF /lib/security")
-        return
-
diff --git a/sos/plugins/postfix.py b/sos/plugins/postfix.py
index 7b1e1808..a8e6565c 100644
--- a/sos/plugins/postfix.py
+++ b/sos/plugins/postfix.py
@@ -26,5 +26,3 @@ class postfix(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/postfix/main.cf")
         self.addCopySpec("/etc/postfix/master.cf")
         self.collectExtOutput("/usr/sbin/postconf")
-        return
-
diff --git a/sos/plugins/printing.py b/sos/plugins/printing.py
index 06cf21a3..3eb846ca 100644
--- a/sos/plugins/printing.py
+++ b/sos/plugins/printing.py
@@ -28,6 +28,3 @@ class printing(sos.plugintools.PluginBase):
         self.collectExtOutput("/usr/bin/lpstat -t")
         self.collectExtOutput("/usr/bin/lpstat -s")
         self.collectExtOutput("/usr/bin/lpstat -d")
-
-        return
-
diff --git a/sos/plugins/process.py b/sos/plugins/process.py
index a054d255..ea19be55 100644
--- a/sos/plugins/process.py
+++ b/sos/plugins/process.py
@@ -25,7 +25,6 @@ class process(sos.plugintools.PluginBase):
         self.collectExtOutput("/bin/ps alxwww")
         self.collectExtOutput("/usr/bin/pstree", root_symlink = "pstree")
         self.collectExtOutput("/usr/sbin/lsof -b +M -n -l", root_symlink = "lsof")
-        return
 
     def find_mountpoint(s):
         if (os.path.ismount(s) or len(s)==0): return s
@@ -57,8 +56,3 @@ class process(sos.plugintools.PluginBase):
 
         if len(dpids):
             self.addDiagnose("one or more processes are in state D (sosreport might hang)")
-
-        return
-
-
-
diff --git a/sos/plugins/psacct.py b/sos/plugins/psacct.py
index 68e2585e..3862f902 100644
--- a/sos/plugins/psacct.py
+++ b/sos/plugins/psacct.py
@@ -19,4 +19,3 @@ class psacct(sos.plugintools.PluginBase):
     """
     def setup(self):
         self.addCopySpec("/var/account")
-        return
diff --git a/sos/plugins/pxe.py b/sos/plugins/pxe.py
index 67af6f97..018718fb 100644
--- a/sos/plugins/pxe.py
+++ b/sos/plugins/pxe.py
@@ -29,4 +29,3 @@ class pxe(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/dhcpd.conf")
         if self.getOption("tftpboot"):
             self.addCopySpec("/tftpboot")
-        return
diff --git a/sos/plugins/quagga.py b/sos/plugins/quagga.py
index 19216eeb..22459676 100644
--- a/sos/plugins/quagga.py
+++ b/sos/plugins/quagga.py
@@ -26,4 +26,3 @@ class quagga(sos.plugintools.PluginBase):
 
     def setup(self):
         self.addCopySpec("/etc/quagga/")
-        return
diff --git a/sos/plugins/radius.py b/sos/plugins/radius.py
index f58f8892..f0a2b7f5 100644
--- a/sos/plugins/radius.py
+++ b/sos/plugins/radius.py
@@ -27,8 +27,6 @@ class radius(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/raddb")
         self.addCopySpec("/etc/pam.d/radiusd")
         self.addCopySpec("/var/log/radius")
-        return
 
     def postproc(self):
         self.doRegexSub("/etc/raddb/sql.conf", r"(\s*password\s*=\s*)\S+", r"\1***")
-        return
diff --git a/sos/plugins/rhn.py b/sos/plugins/rhn.py
index 6be20a76..4412e33c 100644
--- a/sos/plugins/rhn.py
+++ b/sos/plugins/rhn.py
@@ -81,8 +81,6 @@ class rhn(sos.plugintools.PluginBase):
             # copying logs
             self.addCopySpec("/var/log/squid")
 
-        return
-
 #    def diagnose(self):
         # RHN Proxy:
         # * /etc/sysconfig/rhn/systemid is owned by root.apache with the permissions 0640
diff --git a/sos/plugins/rpm.py b/sos/plugins/rpm.py
index 7e7dfccf..33529cee 100644
--- a/sos/plugins/rpm.py
+++ b/sos/plugins/rpm.py
@@ -28,5 +28,3 @@ class rpm(sos.plugintools.PluginBase):
 
         if self.getOption("rpmva"):
             self.collectExtOutput("/bin/rpm -Va", root_symlink = "rpm-Va", timeout = 3600)
-        return
-
diff --git a/sos/plugins/samba.py b/sos/plugins/samba.py
index 1e33758b..4a77decb 100644
--- a/sos/plugins/samba.py
+++ b/sos/plugins/samba.py
@@ -25,5 +25,3 @@ class samba(sos.plugintools.PluginBase):
         self.collectExtOutput("/usr/bin/wbinfo -g")
         self.collectExtOutput("/usr/bin/wbinfo -u")
         self.collectExtOutput("/usr/bin/testparm -s -v")
-        return
-
diff --git a/sos/plugins/sar.py b/sos/plugins/sar.py
index 99e702c0..b017ffa9 100644
--- a/sos/plugins/sar.py
+++ b/sos/plugins/sar.py
@@ -29,7 +29,6 @@ class sar(sos.plugintools.PluginBase):
                 if sar_filename not in dirList:
                     sar_command = "/bin/sh -c \"LANG=C /usr/bin/sar -A -f /var/log/sa/" + fname + "\""
                     self.collectOutputNow(sar_command, sar_filename, root_symlink=sar_filename)
-        return
 
     def checkenabled(self):
         return exists("/var/log/sa") and os.path.exists("/usr/bin/sar")
diff --git a/sos/plugins/selinux.py b/sos/plugins/selinux.py
index 1e01db23..92bfc630 100644
--- a/sos/plugins/selinux.py
+++ b/sos/plugins/selinux.py
@@ -26,8 +26,6 @@ class selinux(sos.plugintools.PluginBase):
             self.collectExtOutput("/sbin/fixfiles check")
         self.addForbiddenPath("/etc/selinux/targeted")
 
-        return
-
     def checkenabled(self):
         try:
             if self.collectOutputNow("/usr/sbin/sestatus", root_symlink = "sestatus").split(":")[1].strip() == "disabled":
diff --git a/sos/plugins/sendmail.py b/sos/plugins/sendmail.py
index 2e839519..6e1b3763 100644
--- a/sos/plugins/sendmail.py
+++ b/sos/plugins/sendmail.py
@@ -26,4 +26,3 @@ class sendmail(sos.plugintools.PluginBase):
     def setup(self):
         self.addCopySpec("/etc/mail/*")
         self.addCopySpec("/var/log/maillog")
-        return
diff --git a/sos/plugins/smartcard.py b/sos/plugins/smartcard.py
index 3f373356..f153cec9 100644
--- a/sos/plugins/smartcard.py
+++ b/sos/plugins/smartcard.py
@@ -32,4 +32,3 @@ class smartcard(sos.plugintools.PluginBase):
         self.collectExtOutput("/usr/bin/pkcs11_inspect debug")
         self.collectExtOutput("/usr/bin/pklogin_finder debug")
         self.collectExtOutput("/bin/ls -l /usr/lib*/pam_pkcs11/")
-        return
diff --git a/sos/plugins/snmp.py b/sos/plugins/snmp.py
index c559cede..896c8d7b 100644
--- a/sos/plugins/snmp.py
+++ b/sos/plugins/snmp.py
@@ -25,5 +25,3 @@ class snmp(sos.plugintools.PluginBase):
 
     def setup(self):
         self.addCopySpec("/etc/snmp")
-        return
-
diff --git a/sos/plugins/soundcard.py b/sos/plugins/soundcard.py
index c2bf9438..de22ecd3 100644
--- a/sos/plugins/soundcard.py
+++ b/sos/plugins/soundcard.py
@@ -31,4 +31,3 @@ class soundcard(sos.plugintools.PluginBase):
         self.collectExtOutput("/usr/bin/aplay -L")
         self.collectExtOutput("/usr/bin/amixer")
         self.collectExtOutput("/sbin/lsmod | /bin/grep snd | /bin/awk '{print $1}'", suggest_filename = "sndmodules_loaded")
-        return 
diff --git a/sos/plugins/squid.py b/sos/plugins/squid.py
index 3e9b3d8b..a6a8ed44 100644
--- a/sos/plugins/squid.py
+++ b/sos/plugins/squid.py
@@ -25,5 +25,3 @@ class squid(sos.plugintools.PluginBase):
 
     def setup(self):
         self.addCopySpec("/etc/squid/squid.conf")
-        return
-
diff --git a/sos/plugins/ssh.py b/sos/plugins/ssh.py
index 6352583b..3aeb584f 100644
--- a/sos/plugins/ssh.py
+++ b/sos/plugins/ssh.py
@@ -22,5 +22,3 @@ class ssh(sos.plugintools.PluginBase):
     def setup(self):
         self.addCopySpec("/etc/ssh/ssh_config")
         self.addCopySpec("/etc/ssh/sshd_config")
-        return
-
diff --git a/sos/plugins/sssd.py b/sos/plugins/sssd.py
index 5bb83734..ecd88cfb 100644
--- a/sos/plugins/sssd.py
+++ b/sos/plugins/sssd.py
@@ -37,4 +37,3 @@ class sssd(sos.plugintools.PluginBase):
     def setup(self):
         self.addCopySpec("/etc/sssd")
         self.addCopySpec("/var/log/sssd/*")
-        return
diff --git a/sos/plugins/startup.py b/sos/plugins/startup.py
index c0cb139a..a8b70088 100644
--- a/sos/plugins/startup.py
+++ b/sos/plugins/startup.py
@@ -26,5 +26,3 @@ class startup(sos.plugintools.PluginBase):
         if self.getOption('servicestatus'):
             self.collectExtOutput("/sbin/service --status-all")
         self.collectExtOutput("/sbin/runlevel")
-        return
-
diff --git a/sos/plugins/system.py b/sos/plugins/system.py
index 43a6b710..b6c8dcc3 100644
--- a/sos/plugins/system.py
+++ b/sos/plugins/system.py
@@ -30,5 +30,3 @@ class system(sos.plugintools.PluginBase):
         self.addCopySpec("/etc/ntp/step-tickers")
         self.addCopySpec("/etc/ntp/ntpservers")
         self.collectExtOutput("/usr/bin/crontab -l")
-        return
-
diff --git a/sos/plugins/systemtap.py b/sos/plugins/systemtap.py
index 9875ed05..47bc30de 100644
--- a/sos/plugins/systemtap.py
+++ b/sos/plugins/systemtap.py
@@ -33,5 +33,3 @@ class systemtap(sos.plugintools.PluginBase):
         #self.collectExtOutput("/bin/rpm -qa 'kernel*' systemtap elfutils --nosignature --nodigest | /bin/egrep -e kernel.*`uname -r` -e systemtap -e elfutils | sort")
         self.collectExtOutput("/usr/bin/stap -V 2")
         self.collectExtOutput("/bin/uname -r")
-        return
-
diff --git a/sos/plugins/tftpserver.py b/sos/plugins/tftpserver.py
index af7e8e28..a8507c00 100644
--- a/sos/plugins/tftpserver.py
+++ b/sos/plugins/tftpserver.py
@@ -25,5 +25,3 @@ class tftpserver(sos.plugintools.PluginBase):
 
     def setup(self):
         self.collectExtOutput("/bin/ls -laR /tftpboot")
-        return
-
diff --git a/sos/plugins/tomcat.py b/sos/plugins/tomcat.py
index 4e52a1fe..57191357 100644
--- a/sos/plugins/tomcat.py
+++ b/sos/plugins/tomcat.py
@@ -23,4 +23,3 @@ class tomcat(sos.plugintools.PluginBase):
     def setup(self):
         self.addCopySpec("/etc/tomcat5")
         self.addCopySpec("/var/log/tomcat5")
-        return
diff --git a/sos/plugins/udev.py b/sos/plugins/udev.py
index 0b48e51e..3fdbbca1 100644
--- a/sos/plugins/udev.py
+++ b/sos/plugins/udev.py
@@ -20,4 +20,3 @@ class udev(sos.plugintools.PluginBase):
     def setup(self):
         self.addCopySpec("/etc/udev/udev.conf")
         self.addCopySpec("/etc/udev/rules.d/*")
-        return
diff --git a/sos/plugins/veritas.py b/sos/plugins/veritas.py
index 7a3eaadd..7359bbfb 100644
--- a/sos/plugins/veritas.py
+++ b/sos/plugins/veritas.py
@@ -36,5 +36,3 @@ class veritas(sos.plugintools.PluginBase):
                 self.addCopySpec(tarfile[0])
         except AttributeError, e:
             self.addAlert(e)
-            return
-        return
diff --git a/sos/plugins/vmware.py b/sos/plugins/vmware.py
index 6b80cb50..369f9091 100644
--- a/sos/plugins/vmware.py
+++ b/sos/plugins/vmware.py
@@ -25,4 +25,3 @@ class vmware(sos.plugintools.PluginBase):
         self.collectExtOutput("/usr/bin/vmware -v")
         self.addCopySpec("/etc/vmware/locations")
         self.addCopySpec("/etc/vmware/config")
-        return
diff --git a/sos/plugins/x11.py b/sos/plugins/x11.py
index 15ea0455..3a5cd38e 100644
--- a/sos/plugins/x11.py
+++ b/sos/plugins/x11.py
@@ -31,5 +31,3 @@ class x11(sos.plugintools.PluginBase):
         self.addForbiddenPath("/etc/X11/fontpath.d")
         
         self.addCopySpec("/etc/gdm")
-
-        return
diff --git a/sos/plugins/xen.py b/sos/plugins/xen.py
index 8256f932..4bc8eef8 100644
--- a/sos/plugins/xen.py
+++ b/sos/plugins/xen.py
@@ -90,8 +90,6 @@ class xen(sos.plugintools.PluginBase):
             # useful, so I'll leave it out for now
         else:
             # for bare-metal, we don't have to do anything special
-            return
+            return #USEFUL
 
         self.addCustomText("Xen hostType: "+host_type)
-        return
-
diff --git a/sos/plugins/xinetd.py b/sos/plugins/xinetd.py
index fc0dce22..323e3814 100644
--- a/sos/plugins/xinetd.py
+++ b/sos/plugins/xinetd.py
@@ -26,5 +26,3 @@ class xinetd(sos.plugintools.PluginBase):
     def setup(self):
         self.addCopySpec("/etc/xinetd.conf")
         self.addCopySpec("/etc/xinetd.d")
-        return
-
diff --git a/sos/plugins/yum.py b/sos/plugins/yum.py
index 7b9de5f1..d82af292 100644
--- a/sos/plugins/yum.py
+++ b/sos/plugins/yum.py
@@ -55,4 +55,3 @@ class yum(sos.plugintools.PluginBase):
                 self.collectExtOutput("/bin/zcat %s" % (output.split()[-1],))
             except IndexError:
                 pass
-        return