Code Cleanup

boa/blockchain/vm/Neo/Account.py

@@ -1,5 +1,5 @@
 
-class Account():
+class Account:
 
     @property
     def ScriptHash(self):

boa/blockchain/vm/Neo/Asset.py

@@ -1,5 +1,5 @@
 
-class Asset():
+class Asset:
 
     @property
     def AssetId(self):

boa/blockchain/vm/Neo/Block.py

@@ -2,7 +2,7 @@
 from boa.blockchain.vm.Neo.Header import GetIndex, GetHash, GetPrevHash, GetTimestamp, GetVersion, GetNextConsensus, GetMerkleRoot, GetConsensusData
 
 
-class Block():
+class Block:
 
     @property
     def TransactionCount(self):

boa/blockchain/vm/Neo/Contract.py

@@ -1,5 +1,5 @@
 
-class Contract():
+class Contract:
 
     @property
     def Script(self):

boa/blockchain/vm/Neo/Header.py

@@ -1,6 +1,6 @@
 
 
-class Header():
+class Header:
 
     def getmyhash(self):
         return GetHash(self)

boa/blockchain/vm/Neo/Input.py

@@ -1,5 +1,5 @@
 
-class TransactionInput():
+class TransactionInput:
 
     @property
     def Hash(self):

boa/blockchain/vm/Neo/Output.py

@@ -1,5 +1,5 @@
 
-class TransactionOutput():
+class TransactionOutput:
 
     @property
     def AssetId(self):

boa/blockchain/vm/Neo/Transaction.py

@@ -1,5 +1,5 @@
 
-class Transaction():
+class Transaction:
 
     @property
     def Hash(self):

boa/blockchain/vm/Neo/TransactionAttribute.py

@@ -1,5 +1,5 @@
 
-class TransactionAttribute():
+class TransactionAttribute:
 
     @property
     def Usage(self):

boa/blockchain/vm/Neo/Validator.py

@@ -1,5 +1,5 @@
 
-class Validator():
+class Validator:
     pass
 
 

boa/blockchain/vm/SmartContract.py

@@ -1,5 +1,5 @@
 
-class SmartContract():
+class SmartContract:
 
     def Sha1(data):
         """

boa/blockchain/vm/System/ExecutionEngine.py

@@ -1,5 +1,5 @@
 
-class ExecutionEngine():
+class ExecutionEngine:
     """
     Not used.
 

boa/blockchain/vm/VMOp.py

@@ -138,7 +138,7 @@
 items = dir(sys.modules[__name__])
 
 
-def ToName(op):
+def to_name(op):
     """
 
     :param op:
@@ -151,10 +151,10 @@ def ToName(op):
         n = getattr(module, item)
 
         try:
-            nn2 = int.from_bytes(n, 'little')
-            if op == nn2:
+            nn = int.from_bytes(n, 'little')
+            if op == nn:
                 return item
-        except Exception as e:
+        except Exception:
             pass
 
     return None

boa/code/block.py

@@ -1,12 +1,12 @@
 
-from byteplay3 import Opcode, Label
+from byteplay3 import Opcode
 from boa.code.pytoken import PyToken
 from boa.code import pyop
 from boa.code.vmtoken import NEO_SC_FRAMEWORK
 import pdb
 
 
-class Block():
+class Block(object):
 
     """
 
@@ -529,13 +529,12 @@ def process_iter_body(self, setup_block):
     def lookup_return_types(self, orig_method):
         ivars = {}
         klass_type = None
-        return_type = None
         for index, token in enumerate(self.oplist):
             if token.py_op == pyop.CALL_FUNCTION:
                 param_count = token.args
 
                 # why would param count be 256 when calling w/ kwargs?
-                # when keyword args are sent, the param count is 256 * num paramms?
+                # when keyword args are sent, the param count is 256 * num params?
                 if param_count % 256 == 0:
                     param_count = 2 * int(param_count / 256)
 

boa/code/items.py

@@ -1,27 +1,19 @@
-from byteplay3 import Code, Opcode
-from boa.code.method import Method
+from byteplay3 import Opcode
 from boa.code.pytoken import PyToken
 
-from boa.code import pyop
 import importlib
 import binascii
 import sys
 import os
 
-from byteplay3 import Code, SetLinenoType, Label
+from byteplay3 import Code, SetLinenoType
 from boa.code import pyop
 
 from boa.code.line import Line
 from boa.code.method import Method
 
-from boa.blockchain.vm import VMOp
-
-from collections import OrderedDict
-
-import pdb
-
 
-class Item():
+class Item(object):
     """
 
     """
@@ -163,10 +155,10 @@ def script_hash_addr(self):
         :return:
         """
 
-        return SmartContractAppCall.ToScriptHashData(self.script_hash)
+        return SmartContractAppCall.to_script_hash_data(self.script_hash)
 
     @staticmethod
-    def ToScriptHashData(item):
+    def to_script_hash_data(item):
         """
 
         :return:

boa/code/line.py

@@ -3,7 +3,7 @@
 from boa.code import pyop
 
 
-class Line():
+class Line(object):
 
     """
 
@@ -30,9 +30,9 @@ def is_constant(self):
 
         :return:
         """
-
-        return (len(self.items) == 3 or len(self.items) == 5) and self.items[1][0] == pyop.LOAD_CONST and self.items[2][0] == pyop.STORE_NAME
-#        return False
+        is_correct_length = len(self.items) == 3 or len(self.items) == 5
+        is_storing_constant = self.items[1][0] == pyop.LOAD_CONST and self.items[2][0] == pyop.STORE_NAME
+        return is_correct_length and is_storing_constant
 
     @property
     def is_module_method_call(self):

boa/code/method.py

@@ -10,12 +10,9 @@
 import dis
 
 import collections
-import pdb
 
-from byteplay3 import object_attributes, print_attr_values, printcodelist
 
-
-class Method():
+class Method(object):
     """
     The method is the main unit of functionality.  Any method can take 0 to many arguments and return 1 value
 
@@ -32,8 +29,9 @@ class Method():
 
     The VMTokenizer is responsible for turning PyToken objects into VMToken objects.
 
-    When the method has been tokenized, each token then has an address within the method.  Once these addresses are complete,
-    the ``convert_jumps`` method is called to tell each flow control operation where (which address) it will need to jump to.
+    When the method has been tokenized, each token then has an address within the method.  Once these addresses are
+    complete, the ``convert_jumps`` method is called to tell each flow control operation where (which address) it will
+    need to jump.
     """
 
     bp = None
@@ -356,7 +354,6 @@ def read_initial_tokens(self):
                 current_label = op
 
             else:
-                instance_type = None
                 if op in [pyop.STORE_FAST, pyop.STORE_NAME, pyop.STORE_GLOBAL] and arg not in self.local_stores.keys():
 
                     self._check_for_type(arg, total_lines)

boa/code/module.py

@@ -9,10 +9,8 @@
 
 from collections import OrderedDict
 
-import pdb
 
-
-class Module():
+class Module(object):
     """
     A Module is the top level component which contains code objects.
     When, for example, compiling ``path/to/my/file.py``, the items contained in ``file.py`` are the module.
@@ -554,7 +552,7 @@ def to_s(self):
 
                 # If this is a number, it is likely a custom python opcode, get the name
                 if str(pt.py_op).isnumeric():
-                    opname = pyop.ToName(int(str(pt.py_op)))
+                    opname = pyop.to_name(int(str(pt.py_op)))
                     if opname is not None:
                         op = "{:<20}".format(opname)
 

boa/code/pyop.py

@@ -189,7 +189,7 @@
 items = dir(sys.modules[__name__])
 
 
-def ToName(op):
+def to_name(op):
     """
 
     :param op:

boa/code/pytoken.py

@@ -1,21 +1,18 @@
 from boa.code import pyop
 
-from byteplay3 import Label, isopcode, haslocal, Code
+from byteplay3 import Label, isopcode, haslocal
 
 from opcode import opname
 
 from boa.blockchain.vm import VMOp
 
-import pdb
-import inspect
-
 NON_RETURN_SYS_CALLS = ['Notify', 'print', 'Log', 'Put', 'Register',
                         'reverse', 'append',
                         'Delete', 'SetVotes', 'ContractDestroy',
                         'MerkleRoot', 'Hash', 'PrevHash', 'GetHeader', ]
 
 
-class PyToken():
+class PyToken(object):
 
     """
 
@@ -111,8 +108,6 @@ def __init__(self, op, lineno, index=None, args=None, array_item=None):
         self.array_item = array_item
 
     def __str__(self):
-        arg = ''
-
         if self.args:
             if type(self.args) is Label:
                 arg = str(self.args)
@@ -225,7 +220,8 @@ def to_vm(self, tokenizer, prev_token=None):
             elif op in [pyop.BINARY_MULTIPLY, pyop.INPLACE_MULTIPLY]:
                 token = tokenizer.convert1(VMOp.MUL, self)
 
-            elif op in [pyop.BINARY_FLOOR_DIVIDE, pyop.BINARY_TRUE_DIVIDE, pyop.INPLACE_FLOOR_DIVIDE, pyop.INPLACE_TRUE_DIVIDE]:
+            elif op in [pyop.BINARY_FLOOR_DIVIDE, pyop.BINARY_TRUE_DIVIDE,
+                        pyop.INPLACE_FLOOR_DIVIDE, pyop.INPLACE_TRUE_DIVIDE]:
                 token = tokenizer.convert1(VMOp.DIV, self)
 
             elif op in [pyop.BINARY_MODULO, pyop.INPLACE_MODULO]:
@@ -267,7 +263,7 @@ def to_vm(self, tokenizer, prev_token=None):
 
             # arrays
             elif op == pyop.BUILD_LIST:
-                token = tokenizer.convert_new_array(VMOp.NEWARRAY, self)
+                token = tokenizer.convert_new_array(self)
             elif op == pyop.SETITEM:
                 token = tokenizer.convert_set_element(self, self.args)
 #                token = tokenizer.convert1(VMOp.SETITEM,self, data=self.args)