dict.items() -> iteritems()

api/fileio.py

@@ -68,7 +68,7 @@ def write_datum(f, data):
 				array = data[stat_group][field]
 				f.write(struct.pack(fmt, *array))
 		else:
-			for mountpoint, disk_data in data['disk'].items():
+			for mountpoint, disk_data in data['disk'].iteritems():
 				mountpoint = mountpoint.encode('utf-8')
 				disk_fmt = '%dp %s %s' % (len(mountpoint) + 1, fmt, fmt)
 				array = disk_data['total'] + disk_data['used']

api/server.py

@@ -59,7 +59,7 @@ def application(environ, start_response):
 		qs = environ['QUERY_STRING']
 		if qs:
 			query = urlparse.parse_qs(qs, True, True)
-			for k, v in query.items():
+			for k, v in query.iteritems():
 				if len(v) > 1:
 					raise HTTPException(400, 'duplicate query parameter: ' + k)
 				query[k] = v[0]
@@ -139,7 +139,7 @@ def get_stats(split, query, environ):
 				field_data = {}
 				# subtract times from last minute, calculate total time spent each minute
 				sums = [0] * 1440
-				for subfield, raw_array in subfields.items():
+				for subfield, raw_array in subfields.iteritems():
 					if subfield != 'num_cpus':
 						array = [None] * 1440
 						for i, d in enumerate(raw_array):
@@ -172,7 +172,7 @@ def get_stats(split, query, environ):
 					field_data['used'][i] = subfields['used'][i] - subfields['buffers'][i] - subfields['cached'][i]
 					field_data['buffers'][i] = subfields['buffers'][i]
 					field_data['cached'][i] = subfields['cached'][i]
-				for subfield, array in field_data.items():
+				for subfield, array in field_data.iteritems():
 					stats[field].setdefault(subfield, {})
 					stats[field][subfield][date] = average(array, interval)
 			elif field == 'net':
@@ -190,7 +190,7 @@ def get_stats(split, query, environ):
 					last_val['net']['bytes_sent'] = subfields['bytes_sent'][i]
 					for subfield in ['err_in', 'err_out', 'drop_in', 'drop_out']:
 						field_data[subfield][i] = subfields[subfield.replace('_', '')][i]
-				for subfield, array in field_data.items():
+				for subfield, array in field_data.iteritems():
 					stats[field].setdefault(subfield, {})
 					stats[field][subfield][date] = average(array, interval)
 	return stats
@@ -226,19 +226,19 @@ def post_datum(split, query, environ):
 
 	index = now.hour * 60 + now.minute
 	data = {}
-	for field, subfields in stats.items():
+	for field, subfields in stats.iteritems():
 		field_data = {}
 		if field == 'disk':
 			disk = stats['disk']
-			for mountpoint, datum in body['disk'].items(): # iterate through body to get new mountpoints
+			for mountpoint, datum in body['disk'].iteritems(): # iterate through body to get new mountpoints
 				disk.setdefault(mountpoint, {'total': [-1] * 1440, 'used': [-1] * 1440})
 				field_data[mountpoint] = {}
-				for subfield, array in disk[mountpoint].items():
+				for subfield, array in disk[mountpoint].iteritems():
 					array = list(array)
 					array[index] = datum[subfield]
 					field_data[mountpoint][subfield] = array
 		else:
-			for subfield, array in subfields.items():
+			for subfield, array in subfields.iteritems():
 				array = list(array)
 				array[index] = body[field][subfield]
 				field_data[subfield] = array