Added new style super calls, removed six module and some more occuren…

…ce of python2, updated setup to enforce python>=3.4,<4

populus/chain/geth.py

@@ -47,7 +47,7 @@ def __init__(self, project_dir, blockchains_dir, chain_name, overrides):
             chain_name,
             'stderr',
         )
-        super(LoggedDevGethProcess, self).__init__(
+        super().__init__(
             overrides=overrides,
             chain_name=chain_name,
             base_dir=blockchains_dir,
@@ -58,14 +58,14 @@ def __init__(self, project_dir, blockchains_dir, chain_name, overrides):
 
 class LoggedTestnetGethProccess(LoggingMixin, TestnetGethProcess):
     def __init__(self, project_dir, geth_kwargs):
-        super(LoggedTestnetGethProccess, self).__init__(
+        super().__init__(
             geth_kwargs=geth_kwargs,
         )
 
 
 class LoggedMainnetGethProcess(LoggingMixin, LiveGethProcess):
     def __init__(self, project_dir, geth_kwargs):
-        super(LoggedMainnetGethProcess, self).__init__(
+        super().__init__(
             geth_kwargs=geth_kwargs,
             stdout_logfile_path=get_geth_logfile_path(
                 project_dir,
@@ -94,15 +94,15 @@ def __init__(self, *args, **kwargs):
         )
         warnings.warn(warn_msg, DeprecationWarning)
         warnings.resetwarnings()
-        super(BaseGethChain, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def initialize_chain(self):
         # context manager shenanigans
         self.stack = ExitStack()
         self.geth = self.get_geth_process_instance()
 
     def get_web3_config(self):
-        base_config = super(BaseGethChain, self).get_web3_config()
+        base_config = super().get_web3_config()
         config = copy.deepcopy(base_config)
         if not config.get('provider.settings'):
             if issubclass(base_config.provider_class, IPCProvider):

populus/chain/testrpc.py

@@ -14,7 +14,7 @@ class TestRPCChain(BaseChain):
     rpc_port = None
 
     def get_web3_config(self):
-        base_config = super(TestRPCChain, self).get_web3_config()
+        base_config = super().get_web3_config()
         config = copy.deepcopy(base_config)
         config['provider.settings.port'] = self.rpc_port
         return config

populus/compilation/backends/solc_combined_json.py

@@ -143,7 +143,7 @@ def __init__(self, *args, **kwargs):
         warn_msg = 'Support for solc <0.4.11 will be dropped in the next populus release'
         warnings.warn(warn_msg, DeprecationWarning)
 
-        super(SolcCombinedJSONBackend, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def get_compiled_contracts(self, source_file_paths, import_remappings):
         self.logger.debug("Import remappings: %s", import_remappings)

populus/compilation/backends/solc_standard_json.py

@@ -116,7 +116,7 @@ def __init__(self, *args, **kwargs):
                 "versions >=0.4.11.  The SolcCombinedJSONBackend should be used "
                 "for all versions <=0.4.8"
             )
-        super(SolcStandardJSONBackend, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def get_compiled_contracts(self, source_file_paths, import_remappings):
         self.logger.debug("Import remappings: %s", import_remappings)

populus/plugin.py

@@ -1,5 +1,4 @@
 import os
-import sys
 import pytest
 
 from populus.project import Project
@@ -19,10 +18,6 @@
 )
 
 
-if sys.version_info.major == 2:
-    FileNotFoundError = OSError
-
-
 def pytest_addoption(parser):
     parser.addoption("--populus-project", help="populus project root directory")
     parser.addini("populus_project", "populus project root directory")

populus/project.py

@@ -1,7 +1,6 @@
 import copy
 import itertools
 import os
-import sys
 
 from eth_utils import (
     to_tuple,
@@ -51,10 +50,6 @@
 )
 
 
-if sys.version_info.major == 2:
-    FileNotFoundError = OSError
-
-
 class Project(object):
     project_dir = None
     config_file_path = None

populus/utils/base58.py

@@ -1,21 +1,13 @@
 """
 Lifted from the base58 package.
 """
-import sys
-
-
 # 58 character alphabet used
 ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
 
 
-if sys.version_info.major == 2:
-    iseq = lambda s: list(map(ord, s))  # noqa: E731
-    bseq = lambda s: ''.join(map(chr, s))  # noqa: E731
-    buffer = lambda s: s  # noqa: E731
-else:
-    iseq = lambda s: s  # noqa: E731
-    bseq = bytes  # noqa: E731
-    buffer = lambda s: s.buffer  # noqa: E731
+iseq = lambda s: s  # noqa: E731
+bseq = bytes  # noqa: E731
+buffer = lambda s: s.buffer  # noqa: E731
 
 
 def b58encode(v):

populus/utils/chains.py

@@ -1,5 +1,6 @@
 import os
 import re
+from urllib import parse
 
 from eth_utils import (
     add_0x_prefix,
@@ -10,9 +11,6 @@
 from .filesystem import (
     normpath,
 )
-from .six import (
-    parse,
-)
 
 
 BASE_BLOCKCHAIN_STORAGE_DIR = "./chains"

populus/utils/filesystem.py

@@ -4,7 +4,6 @@
 import functools
 import os
 import shutil
-import sys
 import tempfile as _tempfile
 
 from eth_utils import (
@@ -14,10 +13,6 @@
 )
 
 
-if sys.version_info.major == 2:
-    FileNotFoundError = OSError
-
-
 def ensure_path_exists(dir_path):
     """
     Make sure that a path exists

populus/utils/string.py

@@ -1,19 +1,12 @@
-import sys
-
 from eth_utils import (
-    force_bytes,
     force_text,
 )
 
 
 def normalize_class_name(value):
     """
     For `type()` calls:
-    * Python 2 wants `str`
     * Python 3.4 wants `str`
     * Python 3.5 doesn't care.
     """
-    if sys.version_info.major == 2:
-        return force_bytes(value)
-    else:
-        return force_text(value)
+    return force_text(value)

setup.py

@@ -15,6 +15,7 @@
     include_package_data=True,
     py_modules=['populus'],
     setup_requires=['setuptools-markdown'],
+    python_requires='>=3.4,<4',
     install_requires=[
         "anyconfig>=0.7.0",
         "click>=6.6",

tests/observer-utils/test_watchdog_based_observer.py

@@ -1,11 +1,9 @@
 import os
+import queue
 
 from populus.utils.filesystem import (
     ensure_file_exists,
 )
-from populus.utils.six import (
-    queue,
-)
 from populus.utils.observers import DirWatcher