fix errors

Author: pipermerriam

ethereum/blocks.py

@@ -1112,7 +1112,7 @@ def account_to_dict(self, address, with_storage_root=False,
                 v2 = subcache.get(utils.big_endian_to_int(k), None)
                 hexkey = b'0x' + encode_hex(utils.zunpad(k))
                 if v2 is not None:
-                    if v2 != '':
+                    if v2 != b'':
                         med_dict['storage'][hexkey] = \
                             b'0x' + encode_hex(v2)
                 elif v is not None:

ethereum/config.py

@@ -1,3 +1,5 @@
+from rlp.utils import decode_hex
+
 from ethereum import utils
 from ethereum.db import BaseDB
 
@@ -52,7 +54,7 @@
     METROPOLIS_STATEROOT_STORE=0x10,
     METROPOLIS_BLOCKHASH_STORE=0x20,
     METROPOLIS_WRAPAROUND=65536,
-    METROPOLIS_GETTER_CODE='6000355460205260206020f3'.decode('hex'),
+    METROPOLIS_GETTER_CODE=decode_hex('6000355460205260206020f3'),
     METROPOLIS_DIFF_ADJUSTMENT_CUTOFF=9,
     # Metropolis fork
 )

ethereum/processblock.py

@@ -146,7 +146,7 @@ def rp(what, actual, target):
         return '%r: %r actual:%r target:%r' % (tx, what, actual, target)
 
     intrinsic_gas = tx.intrinsic_gas_used
-    print 'b1', block.get_balance(tx.sender)
+    print('b1', block.get_balance(tx.sender))
     if block.number >= block.config['HOMESTEAD_FORK_BLKNUM']:
         assert tx.s * 2 < transactions.secpk1n
         if not tx.to or tx.to == CREATE_CONTRACT_ADDRESS:
@@ -165,7 +165,7 @@ def rp(what, actual, target):
     message_data = vm.CallData([safe_ord(x) for x in tx.data], 0, len(tx.data))
     message = vm.Message(tx.sender, tx.to, tx.value, message_gas, message_data, code_address=tx.to)
 
-    print 'b2', block.get_balance(tx.sender)
+    print('b2', block.get_balance(tx.sender))
     # MESSAGE
     ext = VMExt(block, tx)
     if tx.to and tx.to != CREATE_CONTRACT_ADDRESS:
@@ -215,7 +215,7 @@ def rp(what, actual, target):
         block.del_account(s)
     block.add_transaction_to_list(tx)
     block.logs = []
-    print 'b3', block.get_balance(tx.sender), success
+    print('b3', block.get_balance(tx.sender), success)
     return success, output
 
 

ethereum/testutils.py

@@ -403,8 +403,8 @@ def blkhash(n):
             _shouldbe = params1.get(k, None)
             _reallyis = params2.get(k, None)
             if _shouldbe != _reallyis:
-                print 's', shouldbe
-                print 'r', reallyis
+                print('s', shouldbe)
+                print('r', reallyis)
                 raise Exception("Mismatch: " + k + ':\n shouldbe %r\n reallyis %r' %
                                 (_shouldbe, _reallyis))