diff options
| author | Dina Belova <dbelova@mirantis.com> | 2014-07-28 15:10:58 +0400 |
|---|---|---|
| committer | Dina Belova <dbelova@mirantis.com> | 2014-07-28 16:35:16 +0400 |
| commit | d65dd170168897c09401211bc1370c72dd2f549b (patch) | |
| tree | 36e91d497a042e4d94bfe9ea01cf16ba3e785348 /tools | |
| parent | 0d8cb5e75190c006cf7c793cc49f65da269221c7 (diff) | |
| download | ceilometer-d65dd170168897c09401211bc1370c72dd2f549b.tar.gz | |
Replace dict.iteritems() with six.iteritems(dict)
This change is needed to make Ceilometer code both Python 2.x and
3.x compatible in some future. Oslo modules are left without
changes in this change, that will be done directly in the
oslo-incubator code.
Partially-Implements: blueprint ceilometer-py33-support
Change-Id: Ic7fe5819f85524bb36f04dec6cad10d4cf2b935d
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/show_data.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/show_data.py b/tools/show_data.py index 06142593..1cea68eb 100755 --- a/tools/show_data.py +++ b/tools/show_data.py @@ -20,6 +20,7 @@ from __future__ import print_function import sys from oslo.config import cfg +import six from ceilometer import storage @@ -38,7 +39,7 @@ def show_resources(db, args): print(u) for resource in db.get_resources(user=u): print(' %(resource_id)s %(timestamp)s' % resource) - for k, v in sorted(resource['metadata'].iteritems()): + for k, v in sorted(six.iteritems(resource['metadata'])): print(' %-10s : %s' % (k, v)) for meter in resource['meter']: totals = db.get_statistics(storage.SampleFilter( |