Skip to content

Commit 6d4476f

Browse files
author
Thomas Preud'homme
committed
[LNT] Python 3 support: use Python 2's division behavior
Summary: Adapt all divisions to use a call to old_div to maintain Python 2's division behavior in legacy code. Also import Python 3's division behavior by default. This was produced by running futurize's stage2 libfuturize.fixes.fix_division_safe. Reviewers: cmatthews, hubert.reinterpretcast, kristof.beyls Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D67821
1 parent 3a8556e commit 6d4476f

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

lnt/external/stats/pstat.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,24 +138,24 @@ def abut (source,*args):
138138
addon = [addon]
139139
if len(addon) < len(source): # is source list longer?
140140
if len(source) % len(addon) == 0: # are they integer multiples?
141-
repeats = len(source)/len(addon) # repeat addon n times
141+
repeats = len(source) // len(addon) # repeat addon n times
142142
origadd = copy.deepcopy(addon)
143143
for i in range(repeats-1):
144144
addon = addon + origadd
145145
else:
146-
repeats = len(source)/len(addon)+1 # repeat addon x times,
146+
repeats = len(source) // len(addon) + 1 # repeat addon x times,
147147
origadd = copy.deepcopy(addon) # x is NOT an integer
148148
for i in range(repeats-1):
149149
addon = addon + origadd
150150
addon = addon[0:len(source)]
151151
elif len(source) < len(addon): # is addon list longer?
152152
if len(addon) % len(source) == 0: # are they integer multiples?
153-
repeats = len(addon)/len(source) # repeat source n times
153+
repeats = len(addon) // len(source) # repeat source n times
154154
origsour = copy.deepcopy(source)
155155
for i in range(repeats-1):
156156
source = source + origsour
157157
else:
158-
repeats = len(addon)/len(source)+1 # repeat source x times,
158+
repeats = len(addon) // len(source) + 1 # repeat source x times,
159159
origsour = copy.deepcopy(source) # x is NOT an integer
160160
for i in range(repeats-1):
161161
source = source + origsour

lnt/external/stats/stats.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -340,10 +340,10 @@ def lmedianscore (inlist):
340340

341341
newlist = sorted(copy.deepcopy(inlist))
342342
if len(newlist) % 2 == 0: # if even number of scores, average middle 2
343-
index = len(newlist)/2 # integer division correct
343+
index = len(newlist) // 2 # integer division correct
344344
median = float(newlist[index] + newlist[index-1]) /2
345345
else:
346-
index = len(newlist)/2 # int divsion gives mid value when count from 0
346+
index = len(newlist) // 2 # int divsion gives mid value when count from 0
347347
median = newlist[index]
348348
return median
349349

@@ -1747,7 +1747,7 @@ def lshellsort(inlist):
17471747
n = len(inlist)
17481748
svec = copy.deepcopy(inlist)
17491749
ivec = range(n)
1750-
gap = n/2 # integer division needed
1750+
gap = n // 2 # integer division needed
17511751
while gap >0:
17521752
for i in range(gap,n):
17531753
for j in range(i-gap,-1,-gap):
@@ -1758,7 +1758,7 @@ def lshellsort(inlist):
17581758
itemp = ivec[j]
17591759
ivec[j] = ivec[j+gap]
17601760
ivec[j+gap] = itemp
1761-
gap = gap / 2 # integer division needed
1761+
gap = gap // 2 # integer division needed
17621762
# svec is now sorted inlist, and ivec has the order svec[i] = vec[ivec[i]]
17631763
return svec, ivec
17641764

@@ -4260,7 +4260,7 @@ def ashellsort(inarray):
42604260
n = len(inarray)
42614261
svec = inarray *1.0
42624262
ivec = range(n)
4263-
gap = n/2 # integer division needed
4263+
gap = n // 2 # integer division needed
42644264
while gap >0:
42654265
for i in range(gap,n):
42664266
for j in range(i-gap,-1,-gap):
@@ -4271,7 +4271,7 @@ def ashellsort(inarray):
42714271
itemp = ivec[j]
42724272
ivec[j] = ivec[j+gap]
42734273
ivec[j+gap] = itemp
4274-
gap = gap / 2 # integer division needed
4274+
gap = gap // 2 # integer division needed
42754275
# svec is now sorted input vector, ivec has the order svec[i] = vec[ivec[i]]
42764276
return svec, ivec
42774277

lnt/server/db/rules/rule_update_profile_stats.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def update_profile_stats(session, ts, run_id):
3535

3636
for f in glob.glob('%s/*.lntprof' % profile_path):
3737
mtime = os.stat(f).st_mtime
38-
sz = os.stat(f).st_size / 1000
38+
sz = os.stat(f).st_size // 1000
3939
age.append([mtime, sz])
4040

4141
open(history_path, 'w').write(json.dumps(history))

lnt/server/reporting/dailyreport.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def get_query_parameters_string(self):
4646
"{}={}".format(
4747
urllib.quote_plus(query_param), urllib.quote_plus(str(value)))
4848
for query_param, value in (
49-
("day_start", self.day_start_offset.seconds / 3600),
49+
("day_start", self.day_start_offset.seconds // 3600),
5050
("num_days", self.num_prior_days_to_include),
5151
("filter-machine-regex", self.filter_machine_regex_str),)
5252
if value is not None]

0 commit comments

Comments
 (0)