cleanup checking

Author: pipermerriam

ethereum/abi.py

@@ -8,7 +8,7 @@
 
 from ethereum import utils
 from ethereum.utils import encode_int, zpad, big_endian_to_int, is_numeric, is_string, ceil32
-from ethereum.utils import isnumeric, TT256, TT255
+from ethereum.utils import TT256, TT255
 
 
 def json_decode(data):
@@ -327,7 +327,7 @@ def encode_single(typ, arg):
     elif base == 'hash':
         if not (int(sub) and int(sub) <= 32):
             raise EncodingError("too long: %r" % arg)
-        if isnumeric(arg):
+        if is_numeric(arg):
             return zpad(encode_int(arg), 32)
         elif len(arg) == int(sub):
             return zpad(arg, 32)
@@ -338,7 +338,7 @@ def encode_single(typ, arg):
     # Addresses: address (== hash160)
     elif base == 'address':
         assert sub == ''
-        if isnumeric(arg):
+        if is_numeric(arg):
             return zpad(encode_int(arg), 32)
         elif len(arg) == 20:
             return zpad(arg, 32)

ethereum/ethpow.py

@@ -107,7 +107,7 @@ def mine(self, rounds=1000, start_nonce=0):
 
 
 def mine(block_number, difficulty, mining_hash, start_nonce=0, rounds=1000):
-    assert utils.isnumeric(start_nonce)
+    assert utils.is_numeric(start_nonce)
     cache = get_cache(block_number)
     nonce = start_nonce
     target = utils.zpad(utils.int_to_big_endian(2**256 // (difficulty or 1)), 32)

ethereum/slogging.py

@@ -1,9 +1,9 @@
+import sys
 import logging
 import json
 import textwrap
 from json.encoder import JSONEncoder
 from logging import StreamHandler, Formatter, FileHandler
-from ethereum.utils import bcolors, isnumeric
 
 
 DEFAULT_LOGLEVEL = 'INFO'
@@ -20,6 +20,33 @@
 log_listeners = []
 
 
+if sys.version_info.major == 2:
+    integer_types = (int, long)
+    number_types = (int, long, float, complex)
+else:
+    integer_types = (int,)
+    number_types = (int, float, complex)
+
+
+def is_integer(value):
+    return isinstance(value, integer_types)
+
+
+def is_number(value):
+    return isinstance(value, number_types)
+
+
+class bcolors:
+    HEADER = '\033[95m'
+    OKBLUE = '\033[94m'
+    OKGREEN = '\033[92m'
+    WARNING = '\033[91m'
+    FAIL = '\033[91m'
+    ENDC = '\033[0m'
+    BOLD = '\033[1m'
+    UNDERLINE = '\033[4m'
+
+
 def _inject_into_logger(name, code, namespace=None):
     # This is a hack to fool the logging module into reporting correct source files.
     # It determines the actual source of a logging call by inspecting the stack frame's
@@ -190,7 +217,7 @@ def format_message(self, msg, kwargs, highlight, level):
                     msg = json.dumps(message, cls=_LogJSONEncoder)
             except UnicodeDecodeError:
                 message.update({
-                    k: v if isnumeric(v) or isinstance(v, (float, complex)) else repr(v)
+                    k: v if is_number(v) else repr(v)
                     for k, v in kwargs.items()
                 })
                 msg = json.dumps(message, cls=_LogJSONEncoder)
@@ -260,7 +287,7 @@ def _stringify_dict_keys(input_):
         res = {}
         for k, v in input_.items():
             v = _stringify_dict_keys(v)
-            if not isinstance(k, (int, long, bool, None.__class__)):
+            if not is_integer(k) and not isinstance(k, (bool, None.__class__)):
                 k = str(k)
             res[k] = v
     elif isinstance(input_, (list, tuple)):

ethereum/utils.py

@@ -62,8 +62,6 @@ def to_string_for_regexp(value):
     def bytearray_to_bytestr(value):
         return bytes(value)
 
-isnumeric = is_numeric
-
 
 def mk_contract_address(sender, nonce):
     return sha3(rlp.encode([normalize_address(sender), nonce]))[12:]
@@ -145,7 +143,7 @@ def check_and_strip_checksum(x):
 
 
 def normalize_address(x, allow_blank=False):
-    if isinstance(x, (int, long)):
+    if is_numeric(x):
         return int_to_addr(x)
     if allow_blank and (x == '' or x == b''):
         return b''
@@ -428,17 +426,6 @@ def __init__(self):
 trie_root = Binary.fixed_length(32, allow_empty=True)
 
 
-class bcolors:
-    HEADER = '\033[95m'
-    OKBLUE = '\033[94m'
-    OKGREEN = '\033[92m'
-    WARNING = '\033[91m'
-    FAIL = '\033[91m'
-    ENDC = '\033[0m'
-    BOLD = '\033[1m'
-    UNDERLINE = '\033[4m'
-
-
 def DEBUG(msg, *args, **kwargs):
     from ethereum import slogging