diff options
author | Riccardo Spagni <ric@spagni.net> | 2019-04-01 17:37:57 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2019-04-01 17:37:57 +0200 |
commit | 4308a2e1739aa754588e7c1829775602be275215 (patch) | |
tree | 79122528ae2402c6189ed9874a44d51e28626fbd | |
parent | Merge pull request #5339 (diff) | |
parent | block_weight: fix python 2/3 compatibility (diff) | |
download | monero-4308a2e1739aa754588e7c1829775602be275215.tar.xz |
Merge pull request #5318
1a91385e block_weight: fix python 2/3 compatibility (moneromooo-monero)
-rwxr-xr-x | tests/block_weight/block_weight.py | 3 | ||||
-rwxr-xr-x | tests/block_weight/compare.py | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/block_weight/block_weight.py b/tests/block_weight/block_weight.py index d6fd494e3..ba533c53c 100755 --- a/tests/block_weight/block_weight.py +++ b/tests/block_weight/block_weight.py @@ -3,6 +3,7 @@ # This uses the scheme proposed by ArticMine # Written by Sarang Nother # Copyright (c) 2019 The Monero Project +from __future__ import print_function import sys import math @@ -67,7 +68,7 @@ def run(t, blocks): lt_weights.append(min(max_weight,int(ltembw + int(ltembw * 2 / 5)))) #print "H %u, r %u, BW %u, EMBW %u, LTBW %u, LTEMBW %u, ltmedian %u" % (block, r, max_weight, embw, lt_weights[-1], ltembw, ltmedian) - print "H %u, BW %u, EMBW %u, LTBW %u" % (block, max_weight, embw, lt_weights[-1]) + print("H %u, BW %u, EMBW %u, LTBW %u" % (block, max_weight, embw, lt_weights[-1])) run(0, 2 * MEDIAN_WINDOW_BIG) run(1, 9 * MEDIAN_WINDOW_BIG) diff --git a/tests/block_weight/compare.py b/tests/block_weight/compare.py index e058a7079..e046e1640 100755 --- a/tests/block_weight/compare.py +++ b/tests/block_weight/compare.py @@ -1,5 +1,6 @@ -#!/usr/bin/python +#!/usr/bin/env python +from __future__ import print_function import sys import subprocess @@ -10,11 +11,11 @@ else: first = [sys.argv[1]] second = [sys.argv[2]] -print 'running: ', first +print('running: ', first) S0 = subprocess.check_output(first, stderr=subprocess.STDOUT) -print 'running: ', second +print('running: ', second) S1 = subprocess.check_output(second, stderr=subprocess.STDOUT) -print 'comparing' +print('comparing') if S0 != S1: sys.exit(1) sys.exit(0) |