HF state changes + PEP8

Author: konradkonrad

ethereum/blocks.py

@@ -1181,6 +1181,9 @@ def initialize(self, parent):
             self.set_storage_data(utils.normalize_address(self.config["METROPOLIS_BLOCKHASH_STORE"]),
                                   self.number % self.config["METROPOLIS_WRAPAROUND"],
                                   self.prevhash)
+        if self.number == self.config['DAO_FORK_BLKNUM']:
+            for acct in self.config['CHILD_DAO_LIST']:
+                self.transfer_value(acct, self.config['DAO_WITHDRAWER'], self.get_balance(acct))
 
     def finalize(self):
         """Apply rewards and commit."""

ethereum/tests/test_blocks.py

@@ -1,11 +1,8 @@
-import pytest
-
 from ethereum import blocks, utils, db
 from ethereum.exceptions import VerificationFailed, InvalidTransaction
 import rlp
 from rlp.utils import decode_hex, encode_hex, str_to_bytes
 from rlp import DecodingError, DeserializationError
-import os
 import sys
 import ethereum.testutils as testutils
 import copy
@@ -44,7 +41,7 @@ def valueconv(k, v):
     return v
 
 
-def run_block_test(params, config_overrides = {}):
+def run_block_test(params, config_overrides={}):
     b = blocks.genesis(env, start_alloc=params["pre"])
     gbh = params["genesisBlockHeader"]
     b.bloom = utils.scanners['int256b'](gbh["bloom"])