Removed support for PY2. (#1009)

* Removed support for PY2.

* Resolving imports from collections.abc module.

* Use abc.ABC instead of abc.ABCMeta.

* Adding back the line that converts bytes to strings.

Author: dieppedalle

bin/units_from_xls.py

@@ -44,7 +44,6 @@
 import sys
 import tempfile
 
-import six
 import xlrd
 
 # Column names for the columns we care about. This list must be populated in
@@ -163,10 +162,10 @@ def __call__(self, name_or_suffix):
     '15': 'FIFTEEN',
     '30': 'THIRTY',
     '\\': '_',
-    six.unichr(160): '_',  # NO-BREAK SPACE
-    six.unichr(176): 'DEG_',  # DEGREE SIGN
-    six.unichr(186): 'DEG_',  # MASCULINE ORDINAL INDICATOR
-    six.unichr(8211): '_',  # EN DASH
+    chr(160): '_',  # NO-BREAK SPACE
+    chr(176): 'DEG_',  # DEGREE SIGN
+    chr(186): 'DEG_',  # MASCULINE ORDINAL INDICATOR
+    chr(8211): '_',  # EN DASH
 }
 
 
@@ -222,7 +221,7 @@ def unit_defs_from_sheet(sheet, column_names):
     rows = sheet.get_rows()
 
     # Find the indices for the columns we care about.
-    for idx, cell in enumerate(six.next(rows)):
+    for idx, cell in enumerate(next(rows)):
       if cell.value in column_names:
         col_indices[cell.value] = idx
 
@@ -250,7 +249,7 @@ def unit_key_from_name(name):
   """Return a legal python name for the given name for use as a unit key."""
   result = name
 
-  for old, new in six.iteritems(UNIT_KEY_REPLACEMENTS):
+  for old, new in UNIT_KEY_REPLACEMENTS.items():
     result = result.replace(old, new)
 
   # Collapse redundant underscores and convert to uppercase.

examples/all_the_things.py

@@ -28,8 +28,6 @@
 from openhtf.output.callbacks import json_factory
 from openhtf.plugs import user_input
 from openhtf.util import units
-from six.moves import range
-from six.moves import zip
 
 
 @htf.plug(example=example_plugs.example_plug_configured)

openhtf/core/diagnoses_lib.py

@@ -122,15 +122,14 @@ def main():
 """
 
 import abc
+from collections.abc import Iterable as CollectionsIterable
+import enum
 import logging
 from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Text, Type, TYPE_CHECKING, Union
 
 import attr
-import enum  # pylint: disable=g-bad-import-order
 from openhtf.core import test_record
 from openhtf.util import data
-import six
-from six.moves import collections_abc
 
 if TYPE_CHECKING:
   from openhtf.core import test_state  # pylint: disable=g-import-not-at-top
@@ -204,8 +203,8 @@ def _convert_result(self,
       return
     elif isinstance(diagnosis_or_diagnoses, Diagnosis):
       yield self._verify_and_fix_diagnosis(diagnosis_or_diagnoses, diagnoser)
-    elif (isinstance(diagnosis_or_diagnoses, six.string_types) or
-          not isinstance(diagnosis_or_diagnoses, collections_abc.Iterable)):
+    elif (isinstance(diagnosis_or_diagnoses, str) or
+          not isinstance(diagnosis_or_diagnoses, CollectionsIterable)):
       raise InvalidDiagnosisError(
           'Diagnoser {} must return a single Diagnosis or an iterable '
           'of them.'.format(diagnoser.name))
@@ -328,7 +327,7 @@ def _check_definition(self) -> None:
     pass
 
 
-class BasePhaseDiagnoser(six.with_metaclass(abc.ABCMeta, _BaseDiagnoser)):
+class BasePhaseDiagnoser(_BaseDiagnoser, abc.ABC):
   """Base class for using an object to define a Phase diagnoser."""
 
   __slots__ = ()
@@ -377,7 +376,7 @@ def _check_definition(self) -> None:
           'PhaseDiagnoser run function not defined for {}'.format(self.name))
 
 
-class BaseTestDiagnoser(six.with_metaclass(abc.ABCMeta, _BaseDiagnoser)):
+class BaseTestDiagnoser(_BaseDiagnoser, abc.ABC):
   """Base class for using an object to define a Test diagnoser."""
 
   __slots__ = ()

openhtf/core/measurements.py

@@ -71,7 +71,6 @@ def WidgetTestPhase(test):
 from openhtf.util import data
 from openhtf.util import units as util_units
 from openhtf.util import validators
-import six
 if typing.TYPE_CHECKING:
   from openhtf.core import diagnoses_lib
 
@@ -147,7 +146,7 @@ def _coordinates_len(coordinates: Any) -> int:
     coordinates: any type, measurement coordinates for multidimensional
       measurements.
   """
-  if isinstance(coordinates, six.string_types):
+  if isinstance(coordinates, str):
     return 1
   if hasattr(coordinates, '__len__'):
     return len(coordinates)
@@ -361,7 +360,7 @@ def validate_on(
     Returns:
       This measurement, used for chaining operations.
     """
-    for result, validator in six.iteritems(result_to_validator_mapping):
+    for result, validator in result_to_validator_mapping.items():
       if not callable(validator):
         raise ValueError('Validator must be callable', validator)
       self.conditional_validators.append(
@@ -658,7 +657,7 @@ def is_value_set(self) -> bool:
 
   def __iter__(self) -> Iterator[Any]:
     """Iterate over items, allows easy conversion to a dict."""
-    return iter(six.iteritems(self.value_dict))
+    return iter(self.value_dict.items())
 
   def __setitem__(self, coordinates: Any, value: Any) -> None:
     coordinates_len = _coordinates_len(coordinates)
@@ -717,14 +716,14 @@ def value(self) -> List[Any]:
       raise MeasurementNotSetError('Measurement not yet set', self.name)
     return [
         dimensions + (value,)
-        for dimensions, value in six.iteritems(self.value_dict)
+        for dimensions, value in self.value_dict.items()
     ]
 
   def basetype_value(self) -> List[Any]:
     if self._cached_basetype_values is None:
       self._cached_basetype_values = list(
           data.convert_to_base_types(coordinates + (value,))
-          for coordinates, value in six.iteritems(self.value_dict))
+          for coordinates, value in self.value_dict.items())
     return self._cached_basetype_values
 
   def to_dataframe(self, columns: Any = None) -> Any:
@@ -791,7 +790,7 @@ def _assert_valid_key(self, name: Text) -> None:
   def __iter__(self) -> Iterator[Tuple[Text, Any]]:
     """Extract each MeasurementValue's value."""
     return ((key, meas.measured_value.value)
-            for key, meas in six.iteritems(self._measurements))
+            for key, meas in self._measurements.items())
 
   def _custom_setattr(self, name: Text, value: Any) -> None:
     if name == '_measurements':

openhtf/core/monitors.py

@@ -76,14 +76,9 @@ def __init__(self, measurement_name: Text,
     self.extra_kwargs = extra_kwargs
 
   def get_value(self) -> Any:
-    if six.PY3:
-      argspec = inspect.getfullargspec(self.monitor_desc.func)
-      argspec_args = argspec.args
-      argspec_keywords = argspec.varkw
-    else:
-      argspec = inspect.getargspec(self.monitor_desc.func)  # pylint: disable=deprecated-method
-      argspec_args = argspec.args
-      argspec_keywords = argspec.keywords
+    argspec = inspect.getfullargspec(self.monitor_desc.func)
+    argspec_args = argspec.args
+    argspec_keywords = argspec.varkw
     if argspec_keywords:
       # Monitor phase takes **kwargs, so just pass everything in.
       kwargs = self.extra_kwargs

openhtf/core/phase_branches.py

@@ -19,18 +19,17 @@
 """
 
 import abc
+import enum
 from typing import Any, Callable, Dict, Iterator, Text, Tuple, TYPE_CHECKING, Union
 
 import attr
-import enum  # pylint: disable=g-bad-import-order
 from openhtf import util
 from openhtf.core import diagnoses_lib
 from openhtf.core import phase_collections
 from openhtf.core import phase_descriptor
 from openhtf.core import phase_nodes
 from openhtf.core import test_record
 from openhtf.util import data
-import six
 
 if TYPE_CHECKING:
   from openhtf.core import test_state  # pylint: disable=g-import-not-at-top
@@ -142,7 +141,7 @@ def should_run(self, diag_store: diagnoses_lib.DiagnosesStore) -> bool:
 
 
 @attr.s(slots=True, frozen=True)
-class Checkpoint(six.with_metaclass(abc.ABCMeta, phase_nodes.PhaseNode)):
+class Checkpoint(phase_nodes.PhaseNode, abc.ABC):
   """Nodes that check for phase failures or if diagnoses were triggered.
 
   When the condition for a checkpoint is triggered, a STOP or FAIL_SUBTEST

openhtf/core/phase_collections.py

@@ -22,15 +22,14 @@
 
 import abc
 import collections
+from collections.abc import Iterable as CollectionsIterable
 from typing import Any, Callable, DefaultDict, Dict, Iterable, Iterator, List, Optional, Text, Tuple, Type, TypeVar, Union
 
 import attr
 from openhtf import util
 from openhtf.core import base_plugs
 from openhtf.core import phase_descriptor
 from openhtf.core import phase_nodes
-import six
-from six.moves import collections_abc
 
 NodeType = TypeVar('NodeType', bound=phase_nodes.PhaseNode)
 SequenceClassT = TypeVar('SequenceClassT', bound='PhaseSequence')
@@ -45,7 +44,7 @@ class DuplicateSubtestNamesError(Exception):
 
 def _recursive_flatten(n: Any) -> Iterator[phase_nodes.PhaseNode]:
   """Yields flattened phase nodes."""
-  if isinstance(n, collections_abc.Iterable):
+  if isinstance(n, CollectionsIterable):
     for it in n:
       for node in _recursive_flatten(it):
         yield node
@@ -62,8 +61,7 @@ def flatten(n: Any) -> List[phase_nodes.PhaseNode]:
   return list(_recursive_flatten(n))
 
 
-class PhaseCollectionNode(
-    six.with_metaclass(abc.ABCMeta, phase_nodes.PhaseNode)):
+class PhaseCollectionNode(phase_nodes.PhaseNode, abc.ABC):
   """Base class for a node that contains multiple other phase nodes."""
 
   __slots__ = ()

openhtf/core/phase_descriptor.py

@@ -37,8 +37,6 @@
 import openhtf.plugs
 from openhtf.util import data
 
-import six
-
 if TYPE_CHECKING:
   from openhtf.core import test_state  # pylint: disable=g-import-not-at-top
 
@@ -134,7 +132,7 @@ def format_strings(self, **kwargs: Any) -> 'PhaseOptions':
     return data.attr_copy(self, name=util.format_string(self.name, kwargs))
 
   def update(self, **kwargs: Any) -> None:
-    for key, value in six.iteritems(kwargs):
+    for key, value in kwargs.items():
       setattr(self, key, value)
 
   def __call__(self, phase_func: PhaseT) -> 'PhaseDescriptor':
@@ -245,14 +243,10 @@ def with_args(self, **kwargs: Any) -> 'PhaseDescriptor':
     Returns:
       Updated PhaseDescriptor.
     """
-    if six.PY3:
-      argspec = inspect.getfullargspec(self.func)
-      argspec_keywords = argspec.varkw
-    else:
-      argspec = inspect.getargspec(self.func)  # pylint: disable=deprecated-method
-      argspec_keywords = argspec.keywords
+    argspec = inspect.getfullargspec(self.func)
+    argspec_keywords = argspec.varkw
     known_arguments = {}
-    for key, arg in six.iteritems(kwargs):
+    for key, arg in kwargs.items():
       if key in argspec.args or argspec_keywords:
         known_arguments[key] = arg
 
@@ -283,7 +277,7 @@ def with_plugs(self,
     plugs_by_name = {plug.name: plug for plug in self.plugs}
     new_plugs = {}
 
-    for name, sub_class in six.iteritems(subplugs):
+    for name, sub_class in subplugs.items():
       original_plug = plugs_by_name.get(name)
       accept_substitute = True
       if original_plug is None:
@@ -341,12 +335,8 @@ def __call__(self,
       The return value from calling the underlying function.
     """
     kwargs = {}
-    if six.PY3:
-      arg_info = inspect.getfullargspec(self.func)
-      keywords = arg_info.varkw
-    else:
-      arg_info = inspect.getargspec(self.func)  # pylint: disable=deprecated-method
-      keywords = arg_info.keywords
+    arg_info = inspect.getfullargspec(self.func)
+    keywords = arg_info.varkw
     if arg_info.defaults is not None:
       for arg_name, arg_value in zip(arg_info.args[-len(arg_info.defaults):],
                                      arg_info.defaults):
@@ -419,7 +409,7 @@ def _maybe_make(
     """Turn strings into Measurement objects if necessary."""
     if isinstance(meas, core_measurements.Measurement):
       return meas
-    elif isinstance(meas, six.string_types):
+    elif isinstance(meas, str):
       return core_measurements.Measurement(meas, **kwargs)
     raise core_measurements.InvalidMeasurementTypeError(
         'Expected Measurement or string', meas)

openhtf/core/phase_nodes.py

@@ -19,7 +19,6 @@
 
 from openhtf.core import base_plugs
 from openhtf.util import data
-import six
 
 if TYPE_CHECKING:
   from openhtf.core import phase_descriptor  # pylint: disable=g-import-not-at-top
@@ -28,7 +27,7 @@
 ApplyAllNodesT = TypeVar('ApplyAllNodesT', bound='PhaseNode')
 
 
-class PhaseNode(six.with_metaclass(abc.ABCMeta, object)):
+class PhaseNode(abc.ABC):
   """Base class for all executable nodes in OpenHTF."""
 
   __slots__ = ()

openhtf/core/test_descriptor.py

@@ -50,8 +50,6 @@
 from openhtf.util import console_output
 from openhtf.util import logs
 
-import six
-
 CONF = configuration.CONF
 
 _LOG = logging.getLogger(__name__)
@@ -247,7 +245,7 @@ def configure(self, **kwargs: Any) -> None:
       sys.stdout.write(CONF.help_text)
       sys.exit(0)
     logs.configure_logging()
-    for key, value in six.iteritems(kwargs):
+    for key, value in kwargs.items():
       setattr(self._test_options, key, value)
 
   @classmethod