Python modernization 2

tests/core/contracts/test_concise_contract.py

@@ -1,5 +1,6 @@
 
 import sys
+from unittest.mock import Mock
 
 import pytest
 
@@ -13,9 +14,6 @@
     ConciseMethod,
 )
 
-if sys.version_info >= (3, 3):
-    from unittest.mock import Mock
-
 
 @pytest.fixture()
 def EMPTY_ADDR():
@@ -35,7 +33,6 @@ def zero_address_contract(web3, WithConstructorAddressArgumentsContract, EMPTY_A
     return ConciseContract(_address_contract)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 3), reason="needs Mock library from 3.3")
 def test_concisecontract_call_default():
     contract = Mock()
     sweet_method = ConciseMethod(contract, 'grail')
@@ -44,7 +41,6 @@ def test_concisecontract_call_default():
     contract.call().grail.assert_called_once_with(1, 2)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 3), reason="needs Mock library from 3.3")
 def test_concisecontract_custom_transact():
     contract = Mock()
     sweet_method = ConciseMethod(contract, 'grail')
@@ -53,15 +49,13 @@ def test_concisecontract_custom_transact():
     contract.transact().grail.assert_called_once_with(1, 2)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 3), reason="needs Mock library from 3.3")
 def test_concisecontract_two_keywords_fail():
     contract = Mock()
     sweet_method = ConciseMethod(contract, 'grail')
     with pytest.raises(TypeError):
         sweet_method(1, 2, transact={'holy': 3}, call={'count_to': 4})
 
 
-@pytest.mark.skipif(sys.version_info < (3, 3), reason="needs Mock library from 3.3")
 def test_concisecontract_unknown_keyword_fails():
     contract = Mock()
     sweet_method = ConciseMethod(contract, 'grail')

tests/integration/test_ethereum_tester.py

@@ -1,5 +1,4 @@
 import functools
-import sys
 
 import pytest
 
@@ -173,10 +172,6 @@ def _check_web3_clientVersion(self, client_version):
 def not_implemented(method, exc_type=NotImplementedError):
     @functools.wraps(method)
     def inner(*args, **kwargs):
-        if sys.version_info.major == 2:
-            # pytest doesn't do the right thing with the fixture arguments in
-            # python2 so just don't run it.
-            return
         with pytest.raises(exc_type):
             method(*args, **kwargs)
     return inner

tests/integration/test_ethtestrpc.py

@@ -1,5 +1,4 @@
 import functools
-import sys
 
 import pytest
 
@@ -133,10 +132,6 @@ def _check_web3_clientVersion(self, client_version):
 def not_implemented(method, exc_type=AttributeError):
     @functools.wraps(method)
     def inner(*args, **kwargs):
-        if sys.version_info.major == 2:
-            # pytest doesn't do the right thing with the fixture arguments in
-            # python2 so just don't run it.
-            return
         with pytest.raises(exc_type):
             method(*args, **kwargs)
     return inner

tests/integration/test_goethereum.py

@@ -2,7 +2,6 @@
 import signal
 import socket
 import subprocess
-import sys
 import shutil
 import time
 import tempfile
@@ -26,10 +25,6 @@
 )
 
 
-if sys.version_info.major == 2:
-    FileNotFoundError = OSError
-
-
 KEYFILE_PW = 'web3py-test'
 
 

web3/__init__.py

@@ -1,8 +1,4 @@
 import pkg_resources
-import sys
-
-if sys.version_info.major < 3:
-    raise EnvironmentError("Python 3 is required")
 
 from web3.account import Account  # noqa: E402
 from web3.main import Web3  # noqa: E402

web3/account.py

@@ -4,7 +4,6 @@
 )
 import json
 import os
-import sys
 
 from cytoolz import (
     compose,
@@ -36,8 +35,7 @@
     hexstr_if_str,
     text_if_str,
     to_bytes,
-    to_int,
-    to_hex,
+    to_int
 )
 from web3.utils.signing import (
     LocalAccount,
@@ -60,14 +58,11 @@ class Account(object):
     def create(self, extra_entropy=''):
         extra_key_bytes = text_if_str(to_bytes, extra_entropy)
         key_bytes = keccak(os.urandom(32) + extra_key_bytes)
-        if sys.version_info.major < 3:
-            key_bytes = to_hex(key_bytes)
         return self.privateKeyToAccount(key_bytes)
 
     @staticmethod
     def decrypt(keyfile_json, password):
-        if isinstance(keyfile_json, str) or (
-                sys.version_info.major < 3 and isinstance(keyfile_json, unicode)):  # noqa: 821
+        if isinstance(keyfile_json, str):  # noqa: 821
             keyfile = json.loads(keyfile_json)
         elif is_dict(keyfile_json):
             keyfile = keyfile_json
@@ -123,8 +118,6 @@ def recoverTransaction(self, serialized_transaction):
         txn_bytes = HexBytes(serialized_transaction)
         txn = Transaction.from_bytes(txn_bytes)
         msg_hash = hash_of_signed_transaction(txn)
-        if sys.version_info.major < 3:
-            msg_hash = to_hex(msg_hash)
         return self.recover(msg_hash, vrs=vrs_from(txn))
 
     def setKeyBackend(self, backend):
@@ -133,7 +126,6 @@ def setKeyBackend(self, backend):
     def sign(self, message=None, private_key=None, message_hexstr=None, message_text=None):
         '''
         @param private_key in bytes, str, or int.
-            In Python 2, a bytes, unicode or str object will be interpreted as hexstr
             In Python 3, only a str object will be interpreted as hexstr
         '''
         msg_bytes = to_bytes(message, hexstr=message_hexstr, text=message_text)
@@ -153,7 +145,6 @@ def sign(self, message=None, private_key=None, message_hexstr=None, message_text
     def signTransaction(self, transaction_dict, private_key):
         '''
         @param private_key in bytes, str, or int.
-            In Python 2, a bytes, unicode or str object will be interpreted as hexstr
             In Python 3, only a str object will be interpreted as hexstr
         '''
         assert isinstance(transaction_dict, Mapping)

web3/utils/encoding.py

@@ -1,7 +1,6 @@
 # String encodings and numeric representations
 import json
 import re
-import sys
 
 import rlp
 from rlp.sedes import big_endian_int
@@ -73,7 +72,7 @@ def hex_encode_abi_type(abi_type, value, force_size=None):
     elif is_address_type(abi_type):
         return pad_hex(value, data_size)
     elif is_bytes_type(abi_type):
-        if sys.version_info.major >= 3 and is_bytes(value):
+        if is_bytes(value):
             return encode_hex(value)
         else:
             return value
@@ -194,7 +193,6 @@ def to_bytes(primitive=None, hexstr=None, text=None):
     elif is_integer(primitive):
         return to_bytes(hexstr=to_hex(primitive))
     elif hexstr is not None:
-        hexstr = hexstr.rstrip('L')  # handle longs in Python 2
         if len(hexstr) % 2:
             hexstr = '0x0' + remove_0x_prefix(hexstr)
         return decode_hex(hexstr)
@@ -231,16 +229,10 @@ def text_if_str(to_type, text_or_primitive):
 
     @param to_type is a function that takes the arguments (primitive, hexstr=hexstr, text=text),
         eg~ to_bytes, to_text, to_hex, to_int, etc
-    @param hexstr_or_primitive in bytes, str, or int. (or unicode in py2)
-        In Python 2, only a unicode object will be interpreted as unicode text
-        In Python 3, only a str object will be interpreted as interpreted as unicode text
+    @param hexstr_or_primitive in bytes, str, or int.
+        In Python 3, only a str object will be interpreted as unicode text
     '''
-    if sys.version_info.major < 3:
-        if isinstance(text_or_primitive, unicode):  # noqa: F821
-            (primitive, text) = (None, text_or_primitive)
-        else:
-            (primitive, text) = (text_or_primitive, None)
-    elif isinstance(text_or_primitive, str):
+    if isinstance(text_or_primitive, str):
         (primitive, text) = (None, text_or_primitive)
     else:
         (primitive, text) = (text_or_primitive, None)
@@ -254,13 +246,10 @@ def hexstr_if_str(to_type, hexstr_or_primitive):
 
     @param to_type is a function that takes the arguments (primitive, hexstr=hexstr, text=text),
         eg~ to_bytes, to_text, to_hex, to_int, etc
-    @param text_or_primitive in bytes, str, or int. (or unicode in py2)
-        In Python 2, a bytes, unicode or str object will be interpreted as hexstr
+    @param text_or_primitive in bytes, str, or int.
         In Python 3, only a str object will be interpreted as hexstr
     '''
-    if isinstance(hexstr_or_primitive, str) or (
-            sys.version_info.major < 3 and isinstance(hexstr_or_primitive, unicode)  # noqa: F821
-        ):
+    if isinstance(hexstr_or_primitive, str):  # noqa: F821
         (primitive, hexstr) = (None, hexstr_or_primitive)
         if remove_0x_prefix(hexstr) and not is_hex(hexstr):
             raise ValueError(

web3/utils/formatters.py

@@ -2,7 +2,6 @@
     Iterable,
     Mapping,
 )
-import sys
 
 from cytoolz.functoolz import (
     curry,
@@ -23,12 +22,7 @@
 def hex_to_integer(value):
     return int(value, 16)
 
-
-if sys.version_info.major == 2:
-    def integer_to_hex(value):
-        return hex(value).rstrip('L')
-else:
-    integer_to_hex = hex
+integer_to_hex = hex
 
 
 @curry

web3/utils/signing.py

@@ -4,7 +4,6 @@
 from web3.utils.encoding import (
     to_bytes,
     to_int,
-    to_hex,
 )
 
 from web3.utils.transactions import (
@@ -144,8 +143,6 @@ def __init__(self, key, account):
         self.address = key.public_key.to_checksum_address()
 
         key_raw = key.to_bytes()
-        if sys.version_info.major < 3:
-            key_raw = to_hex(key_raw)
         self.privateKey = key_raw
 
         self._key_obj = key
@@ -167,10 +164,3 @@ def signTransaction(self, transaction_dict):
 
     def __bytes__(self):
         return self.privateKey
-
-    # Python 2 support
-    def __str__(self):
-        if sys.version_info.major < 3:
-            return self.privateKey
-        else:
-            return super().__str__()

web3/utils/six/__init__.py

@@ -1,15 +1,5 @@
-import sys
-
-
-if sys.version_info.major == 2:
-    from .six_py2 import (
-        urlparse,
-        urlunparse,
-        Generator,
-    )
-else:
-    from .six_py3 import (  # noqa: #401
-        urlparse,
-        urlunparse,
-        Generator,
-    )
+from .six_py3 import (  # noqa: #401
+    urlparse,
+    urlunparse,
+    Generator,
+)

web3/utils/validation.py

@@ -1,5 +1,4 @@
 import itertools
-import sys
 
 from eth_utils import (
     is_0x_prefixed,
@@ -87,7 +86,7 @@ def validate_abi_value(abi_type, value):
         validate_address(value)
         return
     elif is_bytes_type(abi_type):
-        if sys.version_info.major >= 3 and is_bytes(value):
+        if is_bytes(value):
             return
         elif is_string(value):
             if is_0x_prefixed(value):