diff options
| author | pcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2011-02-11 15:35:41 +0000 |
|---|---|---|
| committer | pcarrier <pcarrier@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2011-02-11 15:35:41 +0000 |
| commit | 22f45f7596ce52f13f26ce494b4c660f292b0cae (patch) | |
| tree | 544b1a5aa880c289d900d22d5a0db5f6d9924666 | |
| parent | 61b64e8f3cae8d37c57475ad637676f7bbeba1e8 (diff) | |
| download | sos-22f45f7596ce52f13f26ce494b4c660f292b0cae.tar.gz | |
[plugins] One True use of glob
- Removing unused imports
- Finished moving to "from glob import glob"
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@1080 ef72aa8b-4018-0410-8976-d6e080ef94d8
| -rw-r--r-- | sos/plugins/corosync.py | 1 | ||||
| -rw-r--r-- | sos/plugins/cs.py | 4 | ||||
| -rw-r--r-- | sos/plugins/general.py | 1 | ||||
| -rw-r--r-- | sos/plugins/initrd.py | 4 | ||||
| -rw-r--r-- | sos/plugins/s390.py | 1 |
5 files changed, 4 insertions, 7 deletions
diff --git a/sos/plugins/corosync.py b/sos/plugins/corosync.py index 785245f6..9c1592f7 100644 --- a/sos/plugins/corosync.py +++ b/sos/plugins/corosync.py @@ -15,7 +15,6 @@ import sos.plugintools import os, re import time, libxml2 -import glob class corosync(sos.plugintools.PluginBase): """ corosync information diff --git a/sos/plugins/cs.py b/sos/plugins/cs.py index 731e7ad5..3142892e 100644 --- a/sos/plugins/cs.py +++ b/sos/plugins/cs.py @@ -18,7 +18,7 @@ import sos.plugintools from os.path import exists -import glob +from glob import glob class cs(sos.plugintools.PluginBase): """Red Hat Certificate System 7.1, 7.3, 8.0 and dogtag related information @@ -27,7 +27,7 @@ class cs(sos.plugintools.PluginBase): def checkversion(self): if self.isInstalled("redhat-cs") or exists("/opt/redhat-cs"): return 71 - elif self.isInstalled("rhpki-common") or len(glob.glob("/var/lib/rhpki-*")): + elif self.isInstalled("rhpki-common") or len(glob("/var/lib/rhpki-*")): return 73 # 8 should cover dogtag elif self.isInstalled("pki-common") or exists("/usr/share/java/pki"): diff --git a/sos/plugins/general.py b/sos/plugins/general.py index 79c61d83..a97eb391 100644 --- a/sos/plugins/general.py +++ b/sos/plugins/general.py @@ -14,7 +14,6 @@ import os import sos.plugintools -import glob import commands class general(sos.plugintools.PluginBase): diff --git a/sos/plugins/initrd.py b/sos/plugins/initrd.py index 899cccf8..98d604a1 100644 --- a/sos/plugins/initrd.py +++ b/sos/plugins/initrd.py @@ -13,13 +13,13 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. import sos.plugintools -import glob +from glob import glob class initrd(sos.plugintools.PluginBase): """initrd related information """ def setup(self): - for initrd in glob.glob('/boot/initrd-*.img'): + for initrd in glob('/boot/initrd-*.img'): self.collectExtOutput("/bin/zcat "+initrd+" | /bin/cpio "+ "--extract --to-stdout init" ) diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py index 50ab0497..e593e313 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 glob import os import sos.plugintools |