print as a function

Author: pipermerriam

ethereum/blocks.py

@@ -74,7 +74,7 @@ def calc_difficulty(parent, timestamp):
     period_count = (parent.number + 1) // config['EXPDIFF_PERIOD']
     if period_count >= config['EXPDIFF_FREE_PERIODS']:
         o = max(o + 2**(period_count - config['EXPDIFF_FREE_PERIODS']), config['MIN_DIFF'])
-    # print 'Calculating difficulty of block %d, timestamp difference %d, parent diff %d, child diff %d' % (parent.number + 1, timestamp - parent.timestamp, parent.difficulty, o)
+    # print('Calculating difficulty of block %d, timestamp difference %d, parent diff %d, child diff %d' % (parent.number + 1, timestamp - parent.timestamp, parent.difficulty, o))
     return o
 
 

ethereum/bloom.py

@@ -27,7 +27,7 @@ def bloom(val):
 
 def bloom_insert(bloom, val):
     h = utils.sha3(val)
-#   print 'bloom_insert', bloom_bits(val), repr(val)
+#   print('bloom_insert', bloom_bits(val), repr(val))
     for i in range(0, BUCKETS_PER_VAL * 2, 2):
         bloom |= 1 << ((safe_ord(h[i + 1]) + (safe_ord(h[i]) << 8)) & 2047)
     return bloom

ethereum/fast_rlp.py

@@ -85,20 +85,20 @@ def run():
         x = trie.Trie(db.EphemDB())
         for i in range(10000):
             x.update(str(i), str(i**3))
-        print 'elapsed', time.time() - st
+        print('elapsed', time.time() - st)
         return x.root_hash
 
     trie.rlp_encode = _encode_optimized
-    print 'trie.rlp_encode = encode_optimized'
+    print('trie.rlp_encode = encode_optimized')
     r3 = run()
 
     trie.rlp_encode = rlp.codec.encode_raw
-    print 'trie.rlp_encode = rlp.codec.encode_raw'
+    print('trie.rlp_encode = rlp.codec.encode_raw')
     r2 = run()
     assert r2 == r3
 
     trie.rlp_encode = rlp.encode
-    print 'trie.rlp_encode = rlp.encode'
+    print('trie.rlp_encode = rlp.encode')
     r = run()
     assert r == r2
 

ethereum/fastvm.py

@@ -209,7 +209,7 @@ def vm_execute(ext, msg, code):
     _prevop = None  # for trace only
 
     while 1:
-      # print 'op: ', op, time.time() - s
+      # print('op: ', op, time.time() - s)
       # s = time.time()
       # stack size limit error
       if compustate.pc not in processed_code:

ethereum/processblock.py

@@ -136,7 +136,7 @@ def __repr__(self):
 def apply_transaction(block, tx):
     validate_transaction(block, tx)
 
-    # print block.get_nonce(tx.sender), '@@@'
+    # print(block.get_nonce(tx.sender), '@@@')
 
     def rp(what, actual, target):
         return '%r: %r actual:%r target:%r' % (tx, what, actual, target)

ethereum/pruning_trie.py

@@ -285,7 +285,7 @@ def set_root_hash(self, root_hash):
         if root_hash == BLANK_ROOT:
             self.root_node = BLANK_NODE
             return
-        # print repr(root_hash)
+        # print(repr(root_hash))
         self.root_node = self._decode_to_node(root_hash)
         # dummy to increase reference count
         # self._encode_node(self.root_node)

ethereum/tests/benchmark_db.py

@@ -17,6 +17,6 @@ def benchmark(size):
         nsz.append(sum([len(v) for k, v in ldb2.kv.items()]))
         t.db = odb
     ldbsz = sum([len(v) for k, v in ldb.kv.items()])
-    print sz, sum(nsz) // len(nsz), ldbsz
+    print(sz, sum(nsz) // len(nsz), ldbsz)
 
 benchmark(int(sys.argv[1]) if len(sys.argv) > 1 else 1000)

ethereum/tests/bintrie.py

@@ -255,8 +255,8 @@ def test(n, m=100):
         k = hashfunc(str(i))
         v = hashfunc('v'+str(i))
         x = update(x, db, [int(a) for a in encode_bin(rlp.encode(k))], v)
-    print x
-    print sum([len(val) for key, val in db.db.items()])
+    print(x)
+    print(sum([len(val) for key, val in db.db.items()]))
     l1 = ListeningDB(db)
     o = 0
     p = 0

ethereum/tests/profile_vm.py

@@ -17,13 +17,13 @@ def do_test_vm(filename, testname=None, testdata=None, limit=99999999, profiler=
 
 if __name__ == '__main__':
     num = 5000
-    print 'profile_vm.py [no_cprofile]'
-    print 'loading tests'
+    print('profile_vm.py [no_cprofile]')
+    print('loading tests')
     fixtures = testutils.get_tests_from_file_or_dir(
         os.path.join(testutils.fixture_path, 'VMTests'))
 
     def run(profiler=None):
-        print 'running'
+        print('running')
         i = 0
         seen = b''
         for filename, tests in fixtures.items():
@@ -33,8 +33,8 @@ def run(profiler=None):
                 do_test_vm(filename, testname, testdata, profiler=profiler)
                 seen += str(testname)
                 i += 1
-        print 'ran %d tests' % i
-        print 'test key', sha3(seen).encode('hex')
+        print('ran %d tests' % i)
+        print('test key', sha3(seen).encode('hex'))
 
     if len(sys.argv) == 1:
         pr = cProfile.Profile()
@@ -43,15 +43,14 @@ def run(profiler=None):
         sortby = 'tottime'
         ps = pstats.Stats(pr, stream=s).sort_stats(sortby)
         ps.print_stats(50)
-        print s.getvalue()
+        print(s.getvalue())
     else:
         # pypy version
         st = time.time()
         run()
-        print
-        print 'took total', time.time() - st
+        print('took total', time.time() - st)
         try:  # pypy branch
             from ethereum.utils import sha3_call_counter
-            print 'took w/o sha3', time.time() - st - sha3_call_counter[3]
+            print('took w/o sha3', time.time() - st - sha3_call_counter[3])
         except ImportError:
             pass

ethereum/tests/test_blocks.py

@@ -95,7 +95,7 @@ def run_block_test(params, config_overrides = {}):
             blockmap[b2.hash] = b2
             env.db.put(b2.hash, rlp.encode(b2))
         if b2:
-            print 'Block %d with state root %s' % (b2.number, b2.state.root_hash.encode('hex'))
+            print('Block %d with state root %s' % (b2.number, b2.state.root_hash.encode('hex')))
         # blkdict = b.to_dict(False, True, False, True)
         # assert blk["blockHeader"] == \
         #     translate_keys(blkdict["header"], translator_list, lambda y, x: x, [])