From 2718f45b69e0bc07d016313c03228953b855fade Mon Sep 17 00:00:00 2001
From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
Date: Fri, 24 Jul 2020 13:51:58 +0000
Subject: [PATCH] Import ABC from collections.abc

---
 st2client/st2client/utils/types.py | 4 ++--
 st2common/st2common/util/db.py     | 5 +++--
 st2common/st2common/util/misc.py   | 4 ++--
 st2common/st2common/util/pack.py   | 4 ++--
 st2common/st2common/util/types.py  | 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/st2client/st2client/utils/types.py b/st2client/st2client/utils/types.py
index 48cc15e29fb..bcd2de31401 100644
--- a/st2client/st2client/utils/types.py
+++ b/st2client/st2client/utils/types.py
@@ -17,14 +17,14 @@
 """
 
 from __future__ import absolute_import
-import collections
+from six.moves.collections_abc import MutableSet
 
 __all__ = [
     'OrderedSet'
 ]
 
 
-class OrderedSet(collections.MutableSet):
+class OrderedSet(MutableSet):
 
     def __init__(self, iterable=None):
         self.end = end = []
diff --git a/st2common/st2common/util/db.py b/st2common/st2common/util/db.py
index ffdedd9f5ad..b8bfb1c8183 100644
--- a/st2common/st2common/util/db.py
+++ b/st2common/st2common/util/db.py
@@ -14,10 +14,11 @@
 
 from __future__ import absolute_import
 
-import collections
 import mongoengine
 import six
 
+from six.moves.collections_abc import Mapping
+
 
 def mongodb_to_python_types(value):
     # Convert MongoDB BaseDict and BaseList types to python dict and list types.
@@ -29,7 +30,7 @@ def mongodb_to_python_types(value):
     # functions used to convert JSON/YAML objects/strings will errored. This is caused
     # by the PR StackStorm/orquesta#191 which converts dict to collections.Mapping
     # in YAQL related functions.
-    elif isinstance(value, collections.Mapping):
+    elif isinstance(value, Mapping):
         value = dict(value)
 
     # Recursively traverse the dict and list to convert values.
diff --git a/st2common/st2common/util/misc.py b/st2common/st2common/util/misc.py
index 06b96b697b8..bd27100f443 100644
--- a/st2common/st2common/util/misc.py
+++ b/st2common/st2common/util/misc.py
@@ -19,10 +19,10 @@
 import os
 import re
 import sys
-import collections
 import functools
 
 import six
+from six.moves.collections_abc import Mapping
 
 __all__ = [
     'prefix_dict_keys',
@@ -137,7 +137,7 @@ def deep_update(d, u):
     """
 
     for k, v in six.iteritems(u):
-        if isinstance(v, collections.Mapping):
+        if isinstance(v, Mapping):
             r = deep_update(d.get(k, {}), v)
             d[k] = r
         else:
diff --git a/st2common/st2common/util/pack.py b/st2common/st2common/util/pack.py
index dce3e5723f5..49ebed187f1 100644
--- a/st2common/st2common/util/pack.py
+++ b/st2common/st2common/util/pack.py
@@ -16,10 +16,10 @@
 
 import os
 import re
-import collections
 
 import six
 
+from six.moves.collections_abc import Iterable
 from st2common.util import schema as util_schema
 from st2common.constants.pack import MANIFEST_FILE_NAME
 from st2common.constants.pack import PACK_REF_WHITELIST_REGEX
@@ -123,7 +123,7 @@ def validate_config_against_schema(config_schema, config_object, config_path,
     except jsonschema.ValidationError as e:
         attribute = getattr(e, 'path', [])
 
-        if isinstance(attribute, (tuple, list, collections.Iterable)):
+        if isinstance(attribute, (tuple, list, Iterable)):
             attribute = [str(item) for item in attribute]
             attribute = '.'.join(attribute)
         else:
diff --git a/st2common/st2common/util/types.py b/st2common/st2common/util/types.py
index 48cc15e29fb..bcd2de31401 100644
--- a/st2common/st2common/util/types.py
+++ b/st2common/st2common/util/types.py
@@ -17,14 +17,14 @@
 """
 
 from __future__ import absolute_import
-import collections
+from six.moves.collections_abc import MutableSet
 
 __all__ = [
     'OrderedSet'
 ]
 
 
-class OrderedSet(collections.MutableSet):
+class OrderedSet(MutableSet):
 
     def __init__(self, iterable=None):
         self.end = end = []