update collections.abc DeprecationWarning project wide (#957)

Author: wallacbe

openhtf/core/diagnoses_lib.py

@@ -131,6 +131,7 @@ def main():
 from openhtf.core import phase_descriptor
 from openhtf.util import data
 import six
+from six.moves import collections_abc
 
 
 class DiagnoserError(Exception):
@@ -201,7 +202,7 @@ def _convert_result(self, diagnosis_or_diagnoses, diagnoser):
     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.Iterable)):
+          not isinstance(diagnosis_or_diagnoses, collections_abc.Iterable)):
       raise InvalidDiagnosisError(
           'Diagnoser {} must return a single Diagnosis or an iterable '
           'of them.'.format(diagnoser.name))

openhtf/core/phase_group.py

@@ -35,13 +35,13 @@
 terminal if any of its Phases or further nested PhaseGroups are also terminal.
 """
 
-import collections
 import functools
 
 import mutablerecords
 
 from openhtf.core import phase_descriptor
 from openhtf.core import test_record
+from six.moves import collections_abc
 
 
 class PhaseGroup(mutablerecords.Record(
@@ -130,7 +130,7 @@ def combine(self, other, name=None):
   def wrap(self, main_phases, name=None):
     """Returns PhaseGroup with additional main phases."""
     new_main = list(self.main)
-    if isinstance(main_phases, collections.Iterable):
+    if isinstance(main_phases, collections_abc.Iterable):
       new_main.extend(main_phases)
     else:
       new_main.append(main_phases)
@@ -212,7 +212,7 @@ def flatten_phases_and_groups(phases_or_groups):
   for phase in phases_or_groups:
     if isinstance(phase, PhaseGroup):
       ret.append(phase.flatten())
-    elif isinstance(phase, collections.Iterable):
+    elif isinstance(phase, collections_abc.Iterable):
       ret.extend(flatten_phases_and_groups(phase))
     else:
       ret.append(phase_descriptor.PhaseDescriptor.wrap_or_copy(phase))
@@ -236,7 +236,7 @@ def optionally_with_args(phase, **kwargs):
   """
   if isinstance(phase, PhaseGroup):
     return phase.with_args(**kwargs)
-  if isinstance(phase, collections.Iterable):
+  if isinstance(phase, collections_abc.Iterable):
     return [optionally_with_args(p, **kwargs) for p in phase]
 
   if not isinstance(phase, phase_descriptor.PhaseDescriptor):
@@ -267,7 +267,7 @@ def optionally_with_plugs(phase, **subplugs):
   """
   if isinstance(phase, PhaseGroup):
     return phase.with_plugs(**subplugs)
-  if isinstance(phase, collections.Iterable):
+  if isinstance(phase, collections_abc.Iterable):
     return [optionally_with_plugs(p, **subplugs) for p in phase]
 
   if not isinstance(phase, phase_descriptor.PhaseDescriptor):

openhtf/util/data.py

@@ -18,7 +18,6 @@
 little easier to work with them.
 """
 
-import collections
 import difflib
 import itertools
 import logging
@@ -35,6 +34,8 @@
 
 from enum import Enum
 import six
+from six.moves import collections_abc
+
 
 # Used by convert_to_base_types().
 PASSTHROUGH_TYPES = {bool, bytes, int, long, type(None), unicode}
@@ -212,7 +213,7 @@ def _sizeof(current_obj):
     if isinstance(current_obj, dict):
       size += sum(map(sizeof, itertools.chain.from_iterable(
           six.iteritems(current_obj))))
-    elif (isinstance(current_obj, collections.Iterable) and
+    elif (isinstance(current_obj, collections_abc.Iterable) and
           not isinstance(current_obj, six.string_types)):
       size += sum(sizeof(item) for item in current_obj)
     elif isinstance(current_obj, records.RecordClass):

openhtf/util/test.py

@@ -112,7 +112,6 @@ def test_multiple(self, mock_my_plug):
   assertMeasurementFail(phase_or_test_rec, measurement)
 """
 
-import collections
 import functools
 import inspect
 import logging
@@ -134,6 +133,8 @@ def test_multiple(self, mock_my_plug):
 from openhtf.plugs import device_wrapping
 from openhtf.util import logs
 import six
+from six.moves import collections_abc
+
 
 logs.CLI_LOGGING_VERBOSITY = 2
 
@@ -142,7 +143,7 @@ class InvalidTestError(Exception):
   """Raised when there's something invalid about a test."""
 
 
-class PhaseOrTestIterator(collections.Iterator):
+class PhaseOrTestIterator(collections_abc.Iterator):
 
   def __init__(self, test_case, iterator, mock_plugs,
                phase_user_defined_state, phase_diagnoses):
@@ -266,7 +267,7 @@ def __next__(self):
     phase_or_test = self.iterator.send(self.last_result)
     if isinstance(phase_or_test, openhtf.Test):
       self.last_result, failure_message = self._handle_test(phase_or_test)
-    elif not isinstance(phase_or_test, collections.Callable):
+    elif not isinstance(phase_or_test, collections_abc.Callable):
       raise InvalidTestError(
           'methods decorated with patch_plugs must yield Test instances or '
           'individual test phases', phase_or_test)
@@ -279,7 +280,7 @@ def next(self):
     phase_or_test = self.iterator.send(self.last_result)
     if isinstance(phase_or_test, openhtf.Test):
       self.last_result, failure_message = self._handle_test(phase_or_test)
-    elif not isinstance(phase_or_test, collections.Callable):
+    elif not isinstance(phase_or_test, collections_abc.Callable):
       raise InvalidTestError(
           'methods decorated with patch_plugs must yield Test instances or '
           'individual test phases', phase_or_test)

openhtf/util/xmlrpcutil.py

@@ -21,6 +21,8 @@
 import threading
 import xmlrpc.client
 import collections
+from six.moves import collections_abc
+
 
 DEFAULT_PROXY_TIMEOUT_S = 3
 
@@ -90,7 +92,7 @@ def __init__(self, *args, **kwargs):
 
   def __getattr__(self, attr):
     method = super(LockedProxyMixin, self).__getattr__(attr)
-    if isinstance(method, collections.Callable):
+    if isinstance(method, collections_abc.Callable):
       # xmlrpc doesn't support **kwargs, so only accept *args.
       def _wrapper(*args):
         with self._lock: