aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sos/plugins/filesys.py4
-rw-r--r--sos/plugins/xfs.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/sos/plugins/filesys.py b/sos/plugins/filesys.py
index b8d6bab9..7564ddf6 100644
--- a/sos/plugins/filesys.py
+++ b/sos/plugins/filesys.py
@@ -15,7 +15,7 @@
from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
import os
import re
-from itertools import *
+from six.moves import zip
class Filesys(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
"""information on filesystems
@@ -46,5 +46,5 @@ class Filesys(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
if self.get_option('dumpe2fs'):
mounts = '/proc/mounts'
ext_fs_regex = r"^(/dev/.+).+ext[234]\s+"
- for dev in izip(self.do_regex_find_all(ext_fs_regex, mounts)):
+ for dev in zip(self.do_regex_find_all(ext_fs_regex, mounts)):
self.add_cmd_output("dumpe2fs -h %s" % (dev))
diff --git a/sos/plugins/xfs.py b/sos/plugins/xfs.py
index fe84b033..1f4dd50b 100644
--- a/sos/plugins/xfs.py
+++ b/sos/plugins/xfs.py
@@ -15,7 +15,7 @@
from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
import os
import re
-from itertools import *
+from six.moves import zip
class Xfs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
"""information on the XFS filesystem
@@ -28,13 +28,13 @@ class Xfs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
def setup(self):
mounts = '/proc/mounts'
ext_fs_regex = r"^(/dev/.+).+xfs\s+"
- for dev in izip(self.do_regex_find_all(ext_fs_regex, mounts)):
+ for dev in zip(self.do_regex_find_all(ext_fs_regex, mounts)):
for e in dev:
parts = e.split(' ')
self.add_cmd_output("xfs_info %s" % (parts[1]))
if self.get_option('logprint'):
- for dev in izip(self.do_regex_find_all(ext_fs_regex, mounts)):
+ for dev in zip(self.do_regex_find_all(ext_fs_regex, mounts)):
for e in dev:
parts = e.split(' ')
self.add_cmd_output("xfs_logprint -c %s" % (parts[0]))