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 a2b55dfb84deb5586dcab0f963c8cd319fd71013..cf211b0b2cf51ab5e6a3785f76cdf57bef1ce26d 100644 (file)
--- 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 2ed0ebd52e093593829f5250fa23d90fcb313e65..4e86d5c2b526c63fbd84a74bc48f826b374d9dc0 100644 (file)
--- 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 1b287eb6c8e63c51a9d53a144d6d1856aecfe360..c955f3150a8657384cb9cb4b4ae55a054f86ccc3 100644 (file)
--- 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 6af7c074f6d99386372d7fb54834080df5d9e548..f81069f4b322523ebceb34321ba365d40160a481 100644 (file)
--- 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