diff options
| author | Alessio Sergi <al3hex@gmail.com> | 2015-05-18 15:55:55 +0200 |
|---|---|---|
| committer | Alessio Sergi <al3hex@gmail.com> | 2015-05-18 16:32:04 +0200 |
| commit | 7d28fe802037bf377f94868a7be0991dd352f4d5 (patch) | |
| tree | ab8ea572aae7f4a0a4c6f314ec1e568e12ac06a2 | |
| parent | 58a1361769ebba6cf8ca9998016f5176d6588e03 (diff) | |
exports: use comprehensions instead of map/lambda
Use enumerate too.
| -rw-r--r-- | glances/exports/glances_csv.py | 14 | ||||
| -rw-r--r-- | glances/exports/glances_export.py | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/glances/exports/glances_csv.py b/glances/exports/glances_csv.py index f1e9a45a..54ea65c6 100644 --- a/glances/exports/glances_csv.py +++ b/glances/exports/glances_csv.py @@ -72,26 +72,26 @@ class Export(GlancesExport): plugins = stats.getAllPlugins() # Loop over available plugin - i = 0 - for plugin in plugins: + for i, plugin in enumerate(plugins): if plugin in self.plugins_to_export(): if isinstance(all_stats[i], list): - for item in all_stats[i]: + for stat in all_stats[i]: # First line: header if self.first_line: - csv_header += map(lambda x: plugin + '_' + item[item['key']] + '_' + x, item) + csv_header += ('{0}_{1}_{2}'.format( + plugin, stat[stat['key']], item) for item in stat) # Others lines: stats - fieldvalues = item.values() + fieldvalues = stat.values() csv_data += fieldvalues elif isinstance(all_stats[i], dict): # First line: header if self.first_line: fieldnames = all_stats[i].keys() - csv_header += map(lambda x: plugin + '_' + x, fieldnames) + csv_header += ('{0}_{1}'.format(plugin, fieldname) + for fieldname in fieldnames) # Others lines: stats fieldvalues = all_stats[i].values() csv_data += fieldvalues - i += 1 # Export to CSV if self.first_line: diff --git a/glances/exports/glances_export.py b/glances/exports/glances_export.py index 628596aa..3bf050b3 100644 --- a/glances/exports/glances_export.py +++ b/glances/exports/glances_export.py @@ -87,7 +87,8 @@ class GlancesExport(object): if isinstance(all_stats[i], list): for item in all_stats[i]: item.update(all_limits[i]) - export_names = list(map(lambda x: item[item['key']] + '.' + x, item.keys())) + export_names = list('{0}.{1}'.format(item[item['key']], key) + for key in item.keys()) export_values = list(item.values()) self.export(plugin, export_names, export_values) elif isinstance(all_stats[i], dict): |