]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/radosgw_admin.py: do not use dict.has_keys()
authorKefu Chai <kchai@redhat.com>
Mon, 6 Apr 2020 08:55:05 +0000 (16:55 +0800)
committerKefu Chai <kchai@redhat.com>
Sun, 14 Jun 2020 08:34:52 +0000 (16:34 +0800)
in python3, `dict.has_key()` was removed. let's use __contains__
instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 590e9b35aa86ab3e70561a8ecde21da2729dafb3)

qa/tasks/radosgw_admin.py

index 86564da1c63f10f116e9f6db93cab7ad715ee8da..7f74691d15e7bcb2dfbab0baa0cff1e43705815e 100644 (file)
@@ -97,7 +97,7 @@ class usage_acc:
     def update(self, c, cat, user, out, b_in, err):
         x = self.c2x(c, cat)
         usage_acc_update2(x, out, b_in, err)
-        if not err and cat == 'create_bucket' and not x.has_key('owner'):
+        if not err and cat == 'create_bucket' and 'owner' not in x:
             x['owner'] = user
     def make_entry(self, cat, bucket, user, out, b_in, err):
         if cat == 'create_bucket' and err:
@@ -115,7 +115,7 @@ class usage_acc:
     def get_usage(self):
         return self.results
     def compare_results(self, results):
-        if not results.has_key('entries') or not results.has_key('summary'):
+        if 'entries' not in results or 'summary' not in results:
             return ['Missing entries or summary']
         r = []
         for e in self.results['entries']: