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

qa/tasks/fs: drop python2 support

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

diff --git a/qa/tasks/fs.py b/qa/tasks/fs.py
index ca84dc7a56d7..70caceaf22d5 100644
--- a/qa/tasks/fs.py
+++ b/qa/tasks/fs.py
@@ -4,7 +4,6 @@ CephFS sub-tasks.
 
 import logging
 import re
-import six
 
 from tasks.cephfs.filesystem import Filesystem
 
@@ -39,7 +38,7 @@ def clients_evicted(ctx, config):
     for rank in fs.get_ranks(status=status):
         ls = fs.rank_asok(['session', 'ls'], rank=rank['rank'], status=status)
         for session in ls:
-            for client, evicted in six.viewitems(clients):
+            for client, evicted in clients.items():
                 mount = mounts.get(client)
                 if mount is not None:
                     global_id = mount.get_global_id()
@@ -52,7 +51,7 @@ def clients_evicted(ctx, config):
 
     no_session = set(clients) - has_session
     should_assert = False
-    for client, evicted in six.viewitems(clients):
+    for client, evicted in clients.items():
         mount = mounts.get(client)
         if mount is not None:
             if evicted: