populus, tests: Translate code to Python 3 using 2to3 fixers.

2to3 tool applies a series of fixers to transform code into Python 3.x specific
syntax. Used commands:

2to3 -n -w populus/
2to3 -n -w tests/

Refs: #465

populus/api/deploy.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import logging
 import time
@@ -55,15 +55,15 @@ def deploy(project, logger, chain_name, wait_for_sync, contracts_to_deploy):
     if contracts_to_deploy:
         # validate that we *know* about all of the contracts
         unknown_contracts = set(contracts_to_deploy).difference(
-            compiled_contracts.keys()
+            list(compiled_contracts.keys())
         )
         if unknown_contracts:
             unknown_contracts_message = (
                 "Some contracts specified for deploy were not found in the "
                 "compiled project contracts.  These contracts could not be found "
                 "'{0}'.  Searched these known contracts '{1}'".format(
                     ', '.join(sorted(unknown_contracts)),
-                    ', '.join(compiled_contracts.keys()),
+                    ', '.join(list(compiled_contracts.keys())),
                 )
             )
             raise click.ClickException(unknown_contracts_message)

populus/chain/base.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 from pylru import lrucache
 
@@ -106,13 +106,13 @@ def contract_backend_configs(self):
             backend_configs,
             self.project.config
         )
-        for backend_name, base_backend_config in sorted_backend_configs.items():
+        for backend_name, base_backend_config in list(sorted_backend_configs.items()):
             yield backend_name, ContractBackendConfig(base_backend_config)
 
     @cached_property
     @to_ordered_dict
     def contract_backends(self):
-        for backend_name, backend_config in self.contract_backend_configs.items():
+        for backend_name, backend_config in list(self.contract_backend_configs.items()):
             ProviderBackendClass = import_string(backend_config['class'])
             yield (
                 backend_name,
@@ -125,7 +125,7 @@ def contract_backends(self):
     @property
     @to_ordered_dict
     def provider_backends(self):
-        for backend_name, backend in self.contract_backends.items():
+        for backend_name, backend in list(self.contract_backends.items()):
             if backend.is_provider:
                 yield backend_name, backend
 
@@ -144,7 +144,7 @@ def provider(self):
     @cached_property
     @to_ordered_dict
     def registrar_backends(self):
-        for backend_name, backend in self.contract_backends.items():
+        for backend_name, backend in list(self.contract_backends.items()):
             if backend.is_registrar:
                 yield backend_name, backend
 

populus/chain/geth.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import copy
 import warnings

populus/cli/config_cmd.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import logging
 

populus/cli/deploy_cmd.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import logging
 

populus/compilation/__init__.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import itertools
 import logging

populus/compilation/backends/solc_auto.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 from semantic_version import (
     Spec,

populus/compilation/backends/solc_combined_json.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import pprint
 import warnings
@@ -59,7 +59,7 @@ def normalize_combined_json_contract_key(key_from_compiler, contract_data):
         else:
             if len(compilation_target) != 1:
                 raise ValueError('Invalid compilationTarget {}'.format(compilation_target))
-            return next(it for it in compilation_target.items())
+            return next(it for it in list(compilation_target.items()))
     source_path, _, name = key_from_compiler.rpartition(':')
     return source_path, name
 
@@ -82,7 +82,7 @@ def normalize_combined_json_contract_data(contract_data):
 
 @to_tuple
 def normalize_compilation_result(compilation_result):
-    for key_from_compiler, raw_contract_data in compilation_result.items():
+    for key_from_compiler, raw_contract_data in list(compilation_result.items()):
         contract_data = normalize_combined_json_contract_data(raw_contract_data)
         source_path, contract_name = normalize_combined_json_contract_key(
             key_from_compiler,

populus/compilation/backends/solc_standard_json.py

@@ -82,8 +82,8 @@ def normalize_compilation_result(compilation_result):
     Take the result from the --standard-json compilation and flatten it into an
     iterable of contract data dictionaries.
     """
-    for source_path, file_contracts in compilation_result['contracts'].items():
-        for contract_name, raw_contract_data in file_contracts.items():
+    for source_path, file_contracts in list(compilation_result['contracts'].items()):
+        for contract_name, raw_contract_data in list(file_contracts.items()):
             contract_data = normalize_standard_json_contract_data(raw_contract_data)
             yield pipe(
                 contract_data,
@@ -162,7 +162,7 @@ def get_compiled_contracts(self, source_file_paths, import_remappings):
 
         set_nested_key(std_input, OUTPUT_SELECTION_KEY, output_selection)
 
-        self.logger.debug("std_input sections: %s", std_input.keys())
+        self.logger.debug("std_input sections: %s", list(std_input.keys()))
         self.logger.debug("Input Description JSON settings are: %s", std_input["settings"])
         self.logger.debug("Command line options are: %s", command_line_options)
         try:

populus/compilation/backends/vyper.py

@@ -12,7 +12,7 @@ class VyperBackend(BaseCompilerBackend):
 
     def get_compiled_contracts(self, source_file_paths, import_remappings):
         try:
-            from vyper import compiler
+            from .vyper import compiler
         except ImportError:
             raise ImportError(
                 'vyper needs to be installed to use VyperBackend' +

populus/config/backend.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 from populus.utils.module_loading import (
     import_string,

populus/config/base.py

@@ -119,7 +119,7 @@ def items(self, flatten=False):
         if flatten:
             _items = flatten_mapping(self._wrapped)
         else:
-            _items = self._wrapped.items()
+            _items = list(self._wrapped.items())
         for key, value in _items:
             yield key, value
 
@@ -141,7 +141,7 @@ def __eq__(self, other):
     def __bool__(self):
         return bool(self._wrapped)
 
-    def __nonzero__(self):
+    def __bool__(self):
         return self.__bool__()
 
     def __len__(self):
@@ -170,7 +170,7 @@ def __contains__(self, key):
         return has_nested_key(self._wrapped, key)
 
     def __iter__(self):
-        return iter(self.keys())
+        return iter(list(self.keys()))
 
     def __copy__(self):
         return type(self)(

populus/config/compiler.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 from eth_utils import (
     is_string,

populus/config/helpers.py

@@ -72,10 +72,10 @@ def get_empty_config():
 
 def resolve_config(config, master_config):
     if '$ref' in config:
-        if len(config.keys()) != 1:
+        if len(list(config.keys())) != 1:
             raise KeyError(
                 "Config references may not contain extra keys.  The keys "
-                "'{0}' were found.".format("', '".join(config.keys()))
+                "'{0}' were found.".format("', '".join(list(config.keys())))
             )
         if not has_nested_key(master_config, config['$ref']):
             raise KeyError(
@@ -122,11 +122,11 @@ def sort_prioritized_configs(backend_configs, master_config):
     backends_with_conflicting_priorities = tuple((
         backend_name
         for backend_name, count
-        in collections.Counter((
+        in list(collections.Counter((
             (backend_name, config['priority'])
             for backend_name, config
             in resolved_backend_configs
-        )).items()
+        )).items())
         if count > 1
     ))
     if backends_with_conflicting_priorities:

populus/config/upgrade/__init__.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 import enum
 import pprint
 

populus/config/upgrade/v1.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import copy
 import pprint
@@ -75,7 +75,7 @@ def upgrade_v1_to_v2(v1_config):
             get_nested_key(v2_default_config, key_path),
         )
 
-    for old_path, new_path in V2_TRANSLATIONS.items():
+    for old_path, new_path in list(V2_TRANSLATIONS.items()):
         if not has_nested_key(upgraded_v1_config, old_path):
             continue
         set_nested_key(

populus/config/upgrade/v2.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import copy
 import pprint

populus/config/upgrade/v3.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import copy
 import itertools
@@ -72,7 +72,7 @@ def upgrade_v3_to_v4(v3_config):
             get_nested_key(v4_default_config, key_path),
         )
 
-    for old_path, new_path in MOVED_V3_PATHS.items():
+    for old_path, new_path in list(MOVED_V3_PATHS.items()):
         default_value = get_nested_key(v4_default_config, new_path)
 
         if has_nested_key(upgraded_v3_config, old_path):

populus/config/upgrade/v4.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import copy
 import itertools
@@ -76,7 +76,7 @@ def upgrade_v4_to_v5(v4_config):
         )
 
     # keys in the new configuration that were relocated.
-    for old_path, new_path in MOVED_V4_PATHS.items():
+    for old_path, new_path in list(MOVED_V4_PATHS.items()):
         default_value = get_nested_key(v5_default_config, new_path)
 
         if has_nested_key(upgraded_v4_config, old_path):

populus/config/upgrade/v5.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import copy
 import pprint

populus/config/upgrade/v6.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import copy
 

populus/config/upgrade/v7.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import copy
 

populus/config/web3.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 from eth_utils import (
     is_string,

populus/contracts/backends/filesystem.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import json
 import os

populus/contracts/backends/project.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 from eth_utils import (
     to_dict,
@@ -30,6 +30,6 @@ def get_contract_identifier(self, contract_name):
     @to_dict
     def get_all_contract_data(self):
         compiled_contracts = self.chain.project.compiled_contract_data
-        for contract_name, contract_data in compiled_contracts.items():
+        for contract_name, contract_data in list(compiled_contracts.items()):
             if is_project_contract(self.chain.project.contracts_source_dirs, contract_data):
                 yield contract_name, contract_data

populus/contracts/backends/testing.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 from populus.utils.contracts import (
     is_test_contract,
@@ -28,7 +28,7 @@ def get_all_contract_data(self):
         testing_contract_data = {
             contract_name: contract_data
             for contract_name, contract_data
-            in self.chain.project.compiled_contract_data.items()
+            in list(self.chain.project.compiled_contract_data.items())
             if is_test_contract(self.chain.project.tests_dir, contract_data)
         }
         return testing_contract_data

populus/contracts/contract.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 from eth_utils import (
     to_dict,

populus/contracts/provider.py

@@ -24,7 +24,7 @@
 
 
 def get_base_contract_factory(contract_identifier, store_backends):
-    for backend in store_backends.values():
+    for backend in list(store_backends.values()):
         try:
             return backend.get_base_contract_factory(contract_identifier)
         except UnknownContract:
@@ -163,7 +163,7 @@ def get_contract_data(self, contract_identifier):
         Returns a dictionary containing the compiler output for the given
         contract identifier.
         """
-        for backend in self.provider_backends.values():
+        for backend in list(self.provider_backends.values()):
             try:
                 return backend.get_contract_data(contract_identifier)
             except UnknownContract:
@@ -180,9 +180,9 @@ def get_all_contract_data(self):
         Returns a dictionary mapping all contract identifiers to their contract data.
         """
         return dict(itertools.chain.from_iterable(
-            backend.get_all_contract_data().items()
+            list(backend.get_all_contract_data().items())
             for backend
-            in self.provider_backends.values()
+            in list(self.provider_backends.values())
         ))
 
     def get_all_contract_names(self):
@@ -192,7 +192,7 @@ def get_all_contract_names(self):
         return set(itertools.chain.from_iterable(
             backend.get_all_contract_names()
             for backend
-            in self.provider_backends.values()
+            in list(self.provider_backends.values())
         ))
 
     def get_contract_factory(self, contract_identifier):

populus/contracts/registrar.py

@@ -39,7 +39,7 @@ def set_contract_address(self, contract_name, contract_address):
         """
         return [
             registrar.set_contract_address(contract_name, contract_address)
-            for registrar in self.registrar_backends.values()
+            for registrar in list(self.registrar_backends.values())
         ]
 
     def get_contract_addresses(self, contract_identifier):
@@ -85,7 +85,7 @@ def get_contract_addresses(self, contract_identifier):
     @to_tuple
     @flatten_return
     def _get_contract_addresses_from_backends(self, contract_identifier):
-        for registrar in self.registrar_backends.values():
+        for registrar in list(self.registrar_backends.values()):
             try:
                 yield registrar.get_contract_addresses(contract_identifier)
             except NoKnownAddress: