From 3f10f70840f6c04fd9427eefcea838b5bf3d5d07 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 26 Nov 2019 10:31:00 +0000
Subject: 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
---
 tests/test_merge_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/test_merge_config.py')

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__), '../'))
-- 
cgit v1.2.3