starlingx/integ
Code Issues Proposed changes

Python 3 compatibility: fix xrange/range issues

Browse Source 
xrange is not defined in python3.
Rename xrange() to range().

Story: 2002909

Task: 24567

Change-Id: I1cf9b77339fee79fd4750ca873a952a39974c23c
Signed-off-by: zhangyangyang <zhangyangyang@unionpay.com>
This commit is contained in:
zhangyangyang 2018-09-01 17:34:05 +08:00
parent 1fdf94bedb
commit 7cd4bf4c76
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/vm-topology/vm-topology/vm_topology/exec/vm_topology.py
View File

@ -444,7 +444,7 @@ def _mask_to_cpulist(mask=0):
# Assume max number of cpus for now... # Assume max number of cpus for now...
max_cpus = 128 max_cpus = 128
for cpu in xrange(max_cpus): for cpu in range(max_cpus):
if ((1 << cpu) & mask): if ((1 << cpu) & mask):
cpulist.append(cpu) cpulist.append(cpu)
return cpulist return cpulist
@ -492,9 +492,9 @@ def range_to_list(csv_range=None):
""" """
if not csv_range: if not csv_range:
return [] return []
xranges = [(lambda L: xrange(L[0], L[-1] + 1))(map(int, r.split('-'))) ranges = [(lambda L: range(L[0], L[-1] + 1))(map(int, r.split('-')))
for r in csv_range.split(',')] for r in csv_range.split(',')]
return [y for x in xranges for y in x] return [y for x in ranges for y in x]
class TimeoutError(Exception): class TimeoutError(Exception):
@ -613,7 +613,7 @@ def do_libvirt_domain_info((host)):
cpulist_d = {} cpulist_d = {}
cpuset_total = 0 cpuset_total = 0
up_total = 0 up_total = 0
for vcpu in xrange(d_nrVirtCpu): for vcpu in range(d_nrVirtCpu):
cpuset_b = d_vcpus[1][vcpu] cpuset_b = d_vcpus[1][vcpu]
cpuset = 0 cpuset = 0
for cpu, up in enumerate(cpuset_b): for cpu, up in enumerate(cpuset_b):