diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-11-26 10:31:00 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-12-11 16:07:37 +0000 |
| commit | 3f10f70840f6c04fd9427eefcea838b5bf3d5d07 (patch) | |
| tree | c68819111feb6838ffe8a72ae6cc5cf1171dd5d8 /tests/test_merge_config.py | |
| parent | 5405cfecb9197d0608ca008e76d4e9cf41e18a18 (diff) | |
| download | kolla-ansible-3f10f70840f6c04fd9427eefcea838b5bf3d5d07.tar.gz kolla-ansible-3f10f70840f6c04fd9427eefcea838b5bf3d5d07.zip | |
Drop python 2 support from action plugins
These are executed on the local host where we run ansible-playbook,
and we have agreed to drop Python 2 support there.
Partially Implements: blueprint drop-py2-support
Change-Id: Id2190c3a22a56f4f048afbf0f7200daa8f41a292
Diffstat (limited to 'tests/test_merge_config.py')
| -rw-r--r-- | tests/test_merge_config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_merge_config.py b/tests/test_merge_config.py index 21a4a0f57..8091025d1 100644 --- a/tests/test_merge_config.py +++ b/tests/test_merge_config.py @@ -17,9 +17,9 @@ import imp import os import sys +from io import StringIO import mock from oslotest import base -from six import StringIO PROJECT_DIR = os.path.abspath(os.path.join(os. path.dirname(__file__), '../')) |