summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-03-05 09:30:12 +0000
committerGerrit Code Review <review@openstack.org>2021-03-05 09:30:12 +0000
commitc056b957556fbf3e78f1f4d3651e1711c6c9fdb9 (patch)
treecb6ff92c62a47b8b814098a1023182bc52cfa453
parentc756724cda76cd91beefb7686e7f5fcc5f7a5a44 (diff)
parent6efaee23d5bc2631b8db912d2cefbf58b8a1a074 (diff)
downloadhorizon-c056b957556fbf3e78f1f4d3651e1711c6c9fdb9.tar.gz
Merge "import "collections.abc" explicitly"
-rw-r--r--horizon/base.py1
-rw-r--r--horizon/tables/base.py1
-rw-r--r--horizon/test/helpers.py2
-rw-r--r--openstack_dashboard/test/integration_tests/decorators.py2
4 files changed, 4 insertions, 2 deletions
diff --git a/horizon/base.py b/horizon/base.py
index 2bbd0d828..829ee6ad7 100644
--- a/horizon/base.py
+++ b/horizon/base.py
@@ -21,6 +21,7 @@ the classes contained therein.
"""
import collections
+import collections.abc
import copy
from importlib import import_module
import inspect
diff --git a/horizon/tables/base.py b/horizon/tables/base.py
index 2837b3d26..2eb1ae5c7 100644
--- a/horizon/tables/base.py
+++ b/horizon/tables/base.py
@@ -13,6 +13,7 @@
# under the License.
import collections
+import collections.abc
import copy
import inspect
import json
diff --git a/horizon/test/helpers.py b/horizon/test/helpers.py
index cc02de7cd..0d1723136 100644
--- a/horizon/test/helpers.py
+++ b/horizon/test/helpers.py
@@ -16,7 +16,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-import collections
+import collections.abc
import copy
import logging
import os
diff --git a/openstack_dashboard/test/integration_tests/decorators.py b/openstack_dashboard/test/integration_tests/decorators.py
index 95cb3bd14..7ce1bc3d0 100644
--- a/openstack_dashboard/test/integration_tests/decorators.py
+++ b/openstack_dashboard/test/integration_tests/decorators.py
@@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-import collections
+import collections.abc
import functools
import inspect