PEP8

Author: konradkonrad

ethereum/chain.py

@@ -12,7 +12,6 @@
 from ethereum.exceptions import VerificationFailed, InvalidTransaction
 from ethereum.slogging import get_logger
 from ethereum.config import Env
-import sys
 log = get_logger('eth.chain')
 
 

ethereum/processblock.py

@@ -1,15 +1,15 @@
 import sys
 import rlp
 from rlp.sedes import CountableList, binary
-from rlp.utils import decode_hex, encode_hex, ascii_chr, str_to_bytes
+from rlp.utils import decode_hex, encode_hex, ascii_chr
 from ethereum import opcodes
 from ethereum import utils
 from ethereum import specials
 from ethereum import bloom
 from ethereum import vm as vm
 from ethereum.exceptions import InvalidNonce, InsufficientStartGas, UnsignedTransaction, \
         BlockGasLimitReached, InsufficientBalance
-from ethereum.utils import safe_ord, normalize_address, mk_contract_address
+from ethereum.utils import safe_ord, mk_contract_address
 from ethereum import transactions
 import ethereum.config as config
 
@@ -149,7 +149,7 @@ def rp(what, actual, target):
     log_tx.debug('TX NEW', tx_dict=tx.log_dict())
     # start transacting #################
     block.increment_nonce(tx.sender)
-                
+
     # buy startgas
     assert block.get_balance(tx.sender) >= tx.startgas * tx.gasprice
     block.delta_balance(tx.sender, -tx.startgas * tx.gasprice)

ethereum/tests/test_contracts.py

@@ -341,13 +341,13 @@ def test_hedge():
     c2 = s.abi_contract(hedge_code, sender=tester.k0)
     # Have the first party register, sending 10^16 wei and
     # asking for a hedge using currency code 500
-    o1 = c2.main(c.address, 500, value=10**16)
+    o1 = c2.main(c.address, 500, value=10 ** 16)
     assert o1 == 1
     # Have the second party register. It should receive the
     # amount of units of the second currency that it is
     # entitled to. Note that from the previous test this is
     # set to 726
-    o2 = c2.main(0, 0, value=10**16, sender=tester.k2)
+    o2 = c2.main(0, 0, value=10 ** 16, sender=tester.k2)
     assert o2 == 7260000000000000000
     snapshot = s.snapshot()
     # Set the price of the asset down to 300 wei
@@ -466,12 +466,12 @@ def recurse():
 
 def test_reverter():
     s = tester.state()
-    c = s.abi_contract(reverter_code, endowment=10**15)
+    c = s.abi_contract(reverter_code, endowment=10 ** 15)
     c.entry()
     assert s.block.get_storage_data(c.address, 8080) == 4040
-    assert s.block.get_balance(decode_hex('0'*39+'7')) == 9
+    assert s.block.get_balance(decode_hex('0' * 39 + '7')) == 9
     assert s.block.get_storage_data(c.address, 8081) == 0
-    assert s.block.get_balance(decode_hex('0'*39+'8')) == 0
+    assert s.block.get_balance(decode_hex('0' * 39 + '8')) == 0
 
 # Test stateless contracts
 
@@ -932,7 +932,6 @@ def kall():
 """
 
 
-
 def test_saveload():
     s = tester.state()
     c = s.abi_contract(saveload_code)
@@ -1077,8 +1076,8 @@ def test_indirect_sort():
     s = tester.state()
     open(filename9, 'w').write(sort_code)
     c = s.abi_contract(sort_tester_code)
-    assert c.test([80, 234, 112, 112, 29]) == [29, 80, 112, 112, 234]
     os.remove(filename9)
+    assert c.test([80, 234, 112, 112, 29]) == [29, 80, 112, 112, 234]
 
 multiarg_code = """
 def kall(a:arr, b, c:arr, d:str, e):
@@ -1232,12 +1231,12 @@ def test_sha256():
     s = tester.state()
     c = s.abi_contract(sha256_code)
     assert c.main() == [
-        0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - 2**256,
-        0xd9147961436944f43cd99d28b2bbddbf452ef872b30c8279e255e7daafc7f946 - 2**256,
-        0xcd6357efdd966de8c0cb2f876cc89ec74ce35f0968e11743987084bd42fb8944 - 2**256,
-        0xcd6357efdd966de8c0cb2f876cc89ec74ce35f0968e11743987084bd42fb8944 - 2**256,
-        0xb393978842a0fa3d3e1470196f098f473f9678e72463cb65ec4ab5581856c2e4 - 2**256,
-        0xb393978842a0fa3d3e1470196f098f473f9678e72463cb65ec4ab5581856c2e4 - 2**256
+        0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 - 2 ** 256,
+        0xd9147961436944f43cd99d28b2bbddbf452ef872b30c8279e255e7daafc7f946 - 2 ** 256,
+        0xcd6357efdd966de8c0cb2f876cc89ec74ce35f0968e11743987084bd42fb8944 - 2 ** 256,
+        0xcd6357efdd966de8c0cb2f876cc89ec74ce35f0968e11743987084bd42fb8944 - 2 ** 256,
+        0xb393978842a0fa3d3e1470196f098f473f9678e72463cb65ec4ab5581856c2e4 - 2 ** 256,
+        0xb393978842a0fa3d3e1470196f098f473f9678e72463cb65ec4ab5581856c2e4 - 2 ** 256
     ]
 
 sha3_code = """
@@ -1250,12 +1249,12 @@ def test_sha3():
     s = tester.state()
     c = s.abi_contract(sha3_code)
     assert c.main() == [
-        0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470 - 2**256,
-        0xc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b - 2**256,
+        0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470 - 2 ** 256,
+        0xc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b - 2 ** 256,
         0x41791102999c339c844880b23950704cc43aa840f3739e365323cda4dfa89e7a,
         0x41791102999c339c844880b23950704cc43aa840f3739e365323cda4dfa89e7a,
-        0xdfded4ed5ac76ba7379cfe7b3b0f53e768dca8d45a34854e649cfc3c18cbd9cd - 2**256,
-        0xdfded4ed5ac76ba7379cfe7b3b0f53e768dca8d45a34854e649cfc3c18cbd9cd - 2**256
+        0xdfded4ed5ac76ba7379cfe7b3b0f53e768dca8d45a34854e649cfc3c18cbd9cd - 2 ** 256,
+        0xdfded4ed5ac76ba7379cfe7b3b0f53e768dca8d45a34854e649cfc3c18cbd9cd - 2 ** 256
     ]
 
 types_in_functions_code = """
@@ -1316,21 +1315,22 @@ def get_prevhashes(k):
     return(o:arr)
 """
 
+
 @pytest.mark.timeout(100)
 def test_prevhashes():
     s = tester.state()
     c = s.abi_contract(prevhashes_code)
     s.mine(7)
     # Hashes of last 14 blocks including existing one
-    o1 = [x % 2**256 for x in c.get_prevhashes(14)]
+    o1 = [x % 2 ** 256 for x in c.get_prevhashes(14)]
     # hash of self = 0, hash of blocks back to genesis block as is, hash of
     # blocks before genesis block = 0
     t1 = [0] + [utils.big_endian_to_int(b.hash) for b in s.blocks[-2::-1]] \
         + [0] * 6
     assert o1 == t1
     s.mine(256)
     # Test 256 limit: only 1 <= g <= 256 generation ancestors get hashes shown
-    o2 = [x % 2**256 for x in c.get_prevhashes(270)]
+    o2 = [x % 2 ** 256 for x in c.get_prevhashes(270)]
     t2 = [0] + [utils.big_endian_to_int(b.hash) for b in s.blocks[-2:-258:-1]] \
         + [0] * 13
     assert o2 == t2

ethereum/transactions.py

@@ -1,6 +1,6 @@
 # -*- coding: utf8 -*-
 import rlp
-from bitcoin import encode_pubkey, N, P, encode_privkey
+from bitcoin import encode_pubkey, N, encode_privkey
 from rlp.sedes import big_endian_int, binary
 from rlp.utils import encode_hex, str_to_bytes, ascii_chr
 from secp256k1 import PublicKey, ALL_FLAGS, PrivateKey
@@ -171,10 +171,9 @@ def intrinsic_gas_used(self):
     @property
     def creates(self):
         "returns the address of a contract created by this tx"
-        if self.to in (b'', '\0'*20):
+        if self.to in (b'', '\0' * 20):
             return mk_contract_address(self.sender, self.nonce)
 
-
     def __eq__(self, other):
         return isinstance(other, self.__class__) and self.hash == other.hash
 
@@ -194,7 +193,7 @@ def __structlog__(self):
     # The >= operator is replaced by > because the integer division N/2 always produces the value
     # which is by 0.5 less than the real N/2
     def check_low_s(self):
-        if self.s > N/2 or self.s == 0:
+        if self.s > N / 2 or self.s == 0:
             raise InvalidTransaction("Invalid signature S value!")