From: Kefu Chai <kchai@redhat.com>
Date: Sun, 19 Jul 2020 09:39:11 +0000 (+0800)
Subject: qa/tasks: drop python2 support from rgw related tests
X-Git-Tag: v16.1.0~1654^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=24e7acc261a498a448935abcc971090fbd2a5789;p=ceph.git

qa/tasks: drop python2 support from rgw related tests

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/qa/tasks/tempest.py b/qa/tasks/tempest.py
index a2b55dfb84de..cf211b0b2cf5 100644
--- a/qa/tasks/tempest.py
+++ b/qa/tasks/tempest.py
@@ -1,11 +1,10 @@
 """
 Deploy and configure Tempest for Teuthology
 """
+import configparser
 import contextlib
 import logging
 
-from six.moves import configparser
-
 from teuthology import misc as teuthology
 from teuthology import contextutil
 from teuthology.exceptions import ConfigError
diff --git a/qa/tasks/tests/test_radosgw_admin.py b/qa/tasks/tests/test_radosgw_admin.py
index 2ed0ebd52e09..4e86d5c2b526 100644
--- a/qa/tasks/tests/test_radosgw_admin.py
+++ b/qa/tasks/tests/test_radosgw_admin.py
@@ -1,8 +1,4 @@
-import six
-if six.PY3:
-    from unittest.mock import Mock
-else:
-    from mock import Mock
+from unittest.mock import Mock
 
 from tasks import radosgw_admin
 
diff --git a/qa/tasks/util/rgw.py b/qa/tasks/util/rgw.py
index 1b287eb6c8e6..c955f3150a86 100644
--- a/qa/tasks/util/rgw.py
+++ b/qa/tasks/util/rgw.py
@@ -2,7 +2,7 @@ import logging
 import json
 import time
 
-from six import StringIO
+from io import StringIO
 
 from teuthology import misc as teuthology
 
diff --git a/qa/tasks/vault.py b/qa/tasks/vault.py
index 6af7c074f6d9..f81069f4b322 100644
--- a/qa/tasks/vault.py
+++ b/qa/tasks/vault.py
@@ -8,8 +8,8 @@ import logging
 import time
 import json
 from os import path
-from six.moves import http_client
-from six.moves.urllib.parse import urljoin
+from http import client as http_client
+from urllib.parse import urljoin
 
 from teuthology import misc as teuthology
 from teuthology import contextutil