Skip to content

Commit 8fee22d

Browse files
committed
more python3 related fixes
1 parent d842976 commit 8fee22d

File tree

154 files changed

+455
-463
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+455
-463
lines changed

src/collectors/aerospike/aerospike.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def collect_latency(self, data):
136136

137137
# Create metrics dict for the namespace/histogram pair
138138
dataset = datasets[i].split(',')[1:]
139-
metrics = dict(zip(fields, dataset))
139+
metrics = dict(list(zip(fields, dataset)))
140140

141141
# Publish a metric for each field in the histogram
142142
for field in fields:
@@ -156,11 +156,11 @@ def collect_latency(self, data):
156156
) = data.split(';')[1::2]
157157

158158
# Collapse each type of data line into a dict of metrics
159-
for op_type in raw_lines.keys():
160-
metrics = dict(zip(fields, raw_lines[op_type].split(',')[1:]))
159+
for op_type in list(raw_lines.keys()):
160+
metrics = dict(list(zip(fields, raw_lines[op_type].split(',')[1:])))
161161

162162
# publish each metric
163-
for metric in metrics.keys():
163+
for metric in list(metrics.keys()):
164164
self.publish_gauge('latency.%s.%s' %
165165
(op_type, metric), metrics[metric])
166166

@@ -206,7 +206,7 @@ def collect_throughput(self, data):
206206
raw_lines['query'],
207207
) = data.split(';')[1::2]
208208

209-
for op_type in raw_lines.keys():
209+
for op_type in list(raw_lines.keys()):
210210
metric = raw_lines[op_type].split(',')[1]
211211
self.publish_gauge('throughput.%s' % op_type, metric)
212212

src/collectors/amavis/amavis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def collect(self):
8181
if res:
8282
groups = res.groupdict()
8383
name = groups['name']
84-
for metric, value in groups.items():
84+
for metric, value in list(groups.items()):
8585
if metric == 'name':
8686
continue
8787
mtype = 'GAUGE'

src/collectors/beanstalkd/beanstalkd.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ def collect(self):
7171

7272
info = self._get_stats()
7373

74-
for stat, value in info['instance'].items():
74+
for stat, value in list(info['instance'].items()):
7575
if stat not in self.SKIP_LIST:
7676
self.publish(stat, value,
7777
metric_type=self.get_metric_type(stat))
7878

7979
for tube_stats in info['tubes']:
8080
tube = tube_stats['name']
81-
for stat, value in tube_stats.items():
81+
for stat, value in list(tube_stats.items()):
8282
if stat != 'name':
8383
self.publish('tubes.%s.%s' % (tube, stat), value,
8484
metric_type=self.get_metric_type(stat))

src/collectors/ceph/ceph.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def flatten_dictionary(input, sep='.', prefix=None):
3838
[('a.b', 10), ('c', 20)]
3939
"""
4040
for name, value in sorted(input.items()):
41-
fullname = sep.join(filter(None, [prefix, name]))
41+
fullname = sep.join([_f for _f in [prefix, name] if _f])
4242
if isinstance(value, dict):
4343
for result in flatten_dictionary(value, sep, fullname):
4444
yield result

src/collectors/ceph/test/testceph.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ def test_counter_default_prefix(self):
103103
expected = 'ceph.osd.325'
104104
sock = '/var/run/ceph/ceph-osd.325.asok'
105105
actual = self.collector._get_counter_prefix_from_socket_name(sock)
106-
self.assertEquals(actual, expected)
106+
self.assertEqual(actual, expected)
107107

108108
def test_counter_alternate_prefix(self):
109109
expected = 'ceph.keep-osd.325'
110110
sock = '/var/run/ceph/keep-osd.325.asok'
111111
actual = self.collector._get_counter_prefix_from_socket_name(sock)
112-
self.assertEquals(actual, expected)
112+
self.assertEqual(actual, expected)
113113

114114
@patch('glob.glob')
115115
def test_get_socket_paths(self, glob_mock):

src/collectors/chronyd/chronyd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def get_output(self):
6565
return ""
6666

6767
def collect(self):
68-
output = self.get_output()
68+
output = self.get_output().decode('utf-8')
6969

7070
for line in output.strip().split("\n"):
7171
m = LINE_PATTERN.search(line)

src/collectors/conntrack/conntrack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,5 @@ def collect(self):
8585
'nf_conntrack/ip_conntrack kernel module was '
8686
'not loaded')
8787
else:
88-
for key in collected.keys():
88+
for key in list(collected.keys()):
8989
self.publish(key, collected[key])

src/collectors/cpu/cpu.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ def cpu_delta_time(interval):
151151

152152
metrics['cpu_count'] = ncpus
153153

154-
for cpu in results.keys():
154+
for cpu in list(results.keys()):
155155
stats = results[cpu]
156-
for s in stats.keys():
156+
for s in list(stats.keys()):
157157
# Get Metric Name
158158
metric_name = '.'.join([cpu, s])
159159
# Get actual data
@@ -163,22 +163,22 @@ def cpu_delta_time(interval):
163163
if use_derivative:
164164
metrics[metric_name] = self.derivative(
165165
metric_name,
166-
long(stats[s]),
166+
int(stats[s]),
167167
self.MAX_VALUES[s]) / div
168168
else:
169-
metrics[metric_name] = long(stats[s]) / div
169+
metrics[metric_name] = int(stats[s]) / div
170170

171171
# Check for a bug in xen where the idle time is doubled for guest
172172
# See https://bugzilla.redhat.com/show_bug.cgi?id=624756
173173
if self.config['xenfix'] is None or self.config['xenfix'] is True:
174174
if os.path.isdir('/proc/xen'):
175175
total = 0
176-
for metric_name in metrics.keys():
176+
for metric_name in list(metrics.keys()):
177177
if 'cpu0.' in metric_name:
178178
total += int(metrics[metric_name])
179179
if total > 110:
180180
self.config['xenfix'] = True
181-
for mname in metrics.keys():
181+
for mname in list(metrics.keys()):
182182
if '.idle' in mname:
183183
metrics[mname] = float(metrics[mname]) / 2
184184
elif total > 0:
@@ -204,28 +204,28 @@ def cpu_delta_time(interval):
204204
if use_derivative:
205205
metrics[cpu + '.user'] = self.derivative(
206206
cpu + '.user',
207-
long(cpu_time[i].user),
207+
int(cpu_time[i].user),
208208
self.MAX_VALUES['user'])
209209
metrics[cpu + '.system'] = self.derivative(
210210
cpu + '.system',
211-
long(cpu_time[i].system),
211+
int(cpu_time[i].system),
212212
self.MAX_VALUES['system'])
213213
metrics[cpu + '.idle'] = self.derivative(
214214
cpu + '.idle',
215-
long(cpu_time[i].idle),
215+
int(cpu_time[i].idle),
216216
self.MAX_VALUES['idle'])
217217
if hasattr(cpu_time[i], 'nice'):
218218
metrics[cpu + '.nice'] = self.derivative(
219219
cpu + '.nice',
220-
long(cpu_time[i].nice),
220+
int(cpu_time[i].nice),
221221
self.MAX_VALUES['nice'])
222222

223223
else:
224-
metrics[cpu + '.user'] = long(cpu_time[i].user)
225-
metrics[cpu + '.system'] = long(cpu_time[i].system)
226-
metrics[cpu + '.idle'] = long(cpu_time[i].idle)
224+
metrics[cpu + '.user'] = int(cpu_time[i].user)
225+
metrics[cpu + '.system'] = int(cpu_time[i].system)
226+
metrics[cpu + '.idle'] = int(cpu_time[i].idle)
227227
if hasattr(cpu_time[i], 'nice'):
228-
metrics[cpu + '.nice'] = long(cpu_time[i].nice)
228+
metrics[cpu + '.nice'] = int(cpu_time[i].nice)
229229

230230
div = 1
231231
if use_normalization and cpu_count > 0:
@@ -234,30 +234,30 @@ def cpu_delta_time(interval):
234234
if use_derivative:
235235
metrics['total.user'] = self.derivative(
236236
'total.user',
237-
long(total_time.user),
237+
int(total_time.user),
238238
self.MAX_VALUES['user']) / div
239239
metrics['total.system'] = self.derivative(
240240
'total.system',
241-
long(total_time.system),
241+
int(total_time.system),
242242
self.MAX_VALUES['system']) / div
243243
metrics['total.idle'] = self.derivative(
244244
'total.idle',
245-
long(total_time.idle),
245+
int(total_time.idle),
246246
self.MAX_VALUES['idle']) / div
247247
if hasattr(total_time, 'nice'):
248248
metrics['total.nice'] = self.derivative(
249249
'total.nice',
250-
long(total_time.nice),
250+
int(total_time.nice),
251251
self.MAX_VALUES['nice']) / div
252252
else:
253-
metrics['total.user'] = long(total_time.user) / div
254-
metrics['total.system'] = long(total_time.system) / div
255-
metrics['total.idle'] = long(total_time.idle) / div
253+
metrics['total.user'] = int(total_time.user) / div
254+
metrics['total.system'] = int(total_time.system) / div
255+
metrics['total.idle'] = int(total_time.idle) / div
256256
if hasattr(total_time, 'nice'):
257-
metrics['total.nice'] = long(total_time.nice) / div
257+
metrics['total.nice'] = int(total_time.nice) / div
258258

259259
# Publish Metric
260-
for metric_name in metrics.keys():
260+
for metric_name in list(metrics.keys()):
261261
self.publish(metric_name,
262262
metrics[metric_name],
263263
precision=2)

src/collectors/cpu/test/testcpu.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
from mock import patch
1010

1111
try:
12-
from cStringIO import StringIO
12+
from io import StringIO
1313
except ImportError:
14-
from StringIO import StringIO
14+
from io import StringIO
1515

1616
from diamond.collector import Collector
1717
from cpu import CPUCollector

src/collectors/cpuacct_cgroup/cpuacct_cgroup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ def collect(self):
6262
stat_file.close()
6363

6464
# create metrics from collected utimes and stimes for cgroups
65-
for parent, cpuacct in results.iteritems():
66-
for key, value in cpuacct.iteritems():
65+
for parent, cpuacct in results.items():
66+
for key, value in cpuacct.items():
6767
metric_name = '.'.join([parent, key])
6868
self.publish(metric_name, value, metric_type='GAUGE')
6969
return True

0 commit comments

Comments
 (0)