From f8f53ffc0f55d4644f3575f34b32eae51d034fdb Mon Sep 17 00:00:00 2001 From: nicolargo Date: Mon, 2 Apr 2018 15:13:59 +0200 Subject: [PATCH] Correct issue on Python 3 --- glances/plugins/glances_diskio.py | 4 ++-- glances/plugins/glances_folders.py | 4 ++-- glances/plugins/glances_fs.py | 4 ++-- glances/plugins/glances_wifi.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/glances/plugins/glances_diskio.py b/glances/plugins/glances_diskio.py index 53dedfc8..8ec3e312 100644 --- a/glances/plugins/glances_diskio.py +++ b/glances/plugins/glances_diskio.py @@ -19,7 +19,7 @@ """Disk I/O plugin.""" -from glances.compat import b +from glances.compat import nativestr from glances.timer import getTimeSinceLastUpdate from glances.plugins.glances_plugin import GlancesPlugin @@ -189,7 +189,7 @@ class Plugin(GlancesPlugin): if len(disk_name) > name_max_width: # Cut disk name if it is too long disk_name = '_' + disk_name[-name_max_width:] - msg = '{:{width}}'.format(b(disk_name), + msg = '{:{width}}'.format(nativestr(disk_name), width=name_max_width) ret.append(self.curse_add_line(msg)) if args.diskio_iops: diff --git a/glances/plugins/glances_folders.py b/glances/plugins/glances_folders.py index 30ebbd8d..f9bee535 100644 --- a/glances/plugins/glances_folders.py +++ b/glances/plugins/glances_folders.py @@ -21,7 +21,7 @@ import numbers -from glances.compat import b +from glances.compat import nativestr from glances.folder_list import FolderList as glancesFolderList from glances.plugins.glances_plugin import GlancesPlugin @@ -116,7 +116,7 @@ class Plugin(GlancesPlugin): path = '_' + i['path'][-name_max_width + 1:] else: path = i['path'] - msg = '{:{width}}'.format(b(path), + msg = '{:{width}}'.format(nativestr(path), width=name_max_width) ret.append(self.curse_add_line(msg)) try: diff --git a/glances/plugins/glances_fs.py b/glances/plugins/glances_fs.py index 426967e6..6dfef0c1 100644 --- a/glances/plugins/glances_fs.py +++ b/glances/plugins/glances_fs.py @@ -21,7 +21,7 @@ import operator -from glances.compat import u, b +from glances.compat import u, nativestr from glances.plugins.glances_plugin import GlancesPlugin import psutil @@ -230,7 +230,7 @@ class Plugin(GlancesPlugin): mnt_point = '_' + i['mnt_point'][-name_max_width + 1:] else: mnt_point = i['mnt_point'] - msg = '{:{width}}'.format(b(mnt_point), + msg = '{:{width}}'.format(nativestr(mnt_point), width=name_max_width) ret.append(self.curse_add_line(msg)) if args.fs_free_space: diff --git a/glances/plugins/glances_wifi.py b/glances/plugins/glances_wifi.py index 74efcf72..66a71337 100644 --- a/glances/plugins/glances_wifi.py +++ b/glances/plugins/glances_wifi.py @@ -21,7 +21,7 @@ import operator -from glances.compat import b +from glances.compat import nativestr from glances.logger import logger from glances.plugins.glances_plugin import GlancesPlugin @@ -196,7 +196,7 @@ class Plugin(GlancesPlugin): if len(hotspotname) > ifname_max_width: hotspotname = '_' + hotspotname[-ifname_max_width + 1:] # Add the new hotspot to the message - msg = '{:{width}}'.format(b(hotspotname), + msg = '{:{width}}'.format(nativestr(hotspotname), width=ifname_max_width) ret.append(self.curse_add_line(msg)) msg = '{:>7}'.format(i['signal'], width=ifname_max_width)