diff --git a/glances/exports/export.py b/glances/exports/export.py index 85ce63c6..080df5d3 100644 --- a/glances/exports/export.py +++ b/glances/exports/export.py @@ -266,7 +266,7 @@ class GlancesExport: if isinstance(stats, dict): # Stats is a dict # Is there a key ? - if "key" in stats.keys() and stats["key"] in stats.keys(): + if "key" in stats and stats["key"] in stats: pre_key = "{}.".format(stats[stats["key"]]) else: pre_key = "" diff --git a/glances/outputs/glances_curses_browser.py b/glances/outputs/glances_curses_browser.py index fa111e5f..1ae197cf 100644 --- a/glances/outputs/glances_curses_browser.py +++ b/glances/outputs/glances_curses_browser.py @@ -87,7 +87,7 @@ class GlancesCursesBrowser(_GlancesCurses): counts[color] = counts.get(color, 0) + 1 result = '' - for key in counts.keys(): + for key in counts: result += key + ': ' + str(counts[key]) + ' ' return result diff --git a/glances/outputs/glances_stdout_csv.py b/glances/outputs/glances_stdout_csv.py index 6dd162ed..35290a61 100644 --- a/glances/outputs/glances_stdout_csv.py +++ b/glances/outputs/glances_stdout_csv.py @@ -55,12 +55,12 @@ class GlancesStdoutCsv: line += f'{plugin}.{attribute}{self.separator}' else: if isinstance(stat, dict): - for k in stat.keys(): + for k in stat: line += f'{plugin}.{str(k)}{self.separator}' elif isinstance(stat, list): for i in stat: if isinstance(i, dict) and 'key' in i: - for k in i.keys(): + for k in i: line += '{}.{}.{}{}'.format(plugin, str(i[i['key']]), str(k), self.separator) else: line += f'{plugin}{self.separator}' diff --git a/glances/outputs/glances_stdout_issue.py b/glances/outputs/glances_stdout_issue.py index b6f50edb..6fea63d8 100644 --- a/glances/outputs/glances_stdout_issue.py +++ b/glances/outputs/glances_stdout_issue.py @@ -98,7 +98,7 @@ class GlancesStdoutIssue: stat = stats.get_plugin(plugin).get_export() # Hide private information if plugin == 'ip': - for key in stat.keys(): + for key in stat: stat[key] = '***' except Exception as e: stat_error = e diff --git a/glances/plugins/sensors/__init__.py b/glances/plugins/sensors/__init__.py index 17d79bd7..11c945f1 100644 --- a/glances/plugins/sensors/__init__.py +++ b/glances/plugins/sensors/__init__.py @@ -156,7 +156,7 @@ class SensorsPlugin(GlancesPluginModel): if self.input_method == 'local': with ThreadPoolExecutor(max_workers=len(self.sensors_grab_map)) as executor: logger.debug(f"Sensors enabled sub plugins: {list(self.sensors_grab_map.keys())}") - futures = {t: executor.submit(self.__get_sensor_data, t) for t in self.sensors_grab_map.keys()} + futures = {t: executor.submit(self.__get_sensor_data, t) for t in self.sensors_grab_map} # Merge the results for sensor_type, future in futures.items(): diff --git a/glances/plugins/smart/__init__.py b/glances/plugins/smart/__init__.py index 19589f42..27c8831d 100644 --- a/glances/plugins/smart/__init__.py +++ b/glances/plugins/smart/__init__.py @@ -185,10 +185,10 @@ class SmartPlugin(GlancesPluginModel): msg = '{:{width}}'.format(device_stat['DeviceName'][:max_width], width=max_width) ret.append(self.curse_add_line(msg)) try: - device_stat_sorted = sorted([i for i in device_stat.keys() if i != 'DeviceName'], key=int) + device_stat_sorted = sorted([i for i in device_stat if i != 'DeviceName'], key=int) except ValueError: # Catch ValueError, see #2904 - device_stat_sorted = [i for i in device_stat.keys() if i != 'DeviceName'] + device_stat_sorted = [i for i in device_stat if i != 'DeviceName'] for smart_stat in device_stat_sorted: ret.append(self.curse_new_line()) msg = ' {:{width}}'.format( diff --git a/tests/test_core.py b/tests/test_core.py index 9e103547..4cccaee8 100755 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -404,7 +404,7 @@ class TestGlances(unittest.TestCase): assert len(stats_grab) == 0 else: print(stats_grab) - self.assertTrue(stat in stats_grab[0].keys(), msg=f'Cannot find key: {stat}') + self.assertTrue(stat in stats_grab[0], msg=f'Cannot find key: {stat}') print(f'INFO: SMART stats: {stats_grab}')