import 15.2.0 Octopus source

[ceph.git] / ceph / src / test / rgw / rgw_multi / zone_cloud.py

diff --git a/ceph/src/test/rgw/rgw_multi/zone_cloud.py b/ceph/src/test/rgw/rgw_multi/zone_cloud.py
index 4e5eefb8c11b5b8a11d223967f419eebc69a5f17..83bfae19e6c1cf1c9fbc6389f25b1738a0ad0824 100644 (file)
--- a/ceph/src/test/rgw/rgw_multi/zone_cloud.py
+++ b/ceph/src/test/rgw/rgw_multi/zone_cloud.py
@@ -12,7 +12,7 @@ import re
 
 from nose.tools import eq_ as eq
 try:
-    from itertools import izip_longest as zip_longest
+    from itertools import izip_longest as zip_longest  # type: ignore
 except ImportError:
     from itertools import zip_longest
 
@@ -116,7 +116,7 @@ class CloudKey:
             self.etag = '"' + self.etag + '"'
 
         new_meta = {}
-        for meta_key, meta_val in k.metadata.iteritems():
+        for meta_key, meta_val in k.metadata.items():
             if not meta_key.startswith('rgwx-'):
                 new_meta[meta_key] = meta_val
 
@@ -140,14 +140,6 @@ class CloudKey:
 
         return r
 
-def append_query_arg(s, n, v):
-    if not v:
-        return s
-    nv = '{n}={v}'.format(n=n, v=v)
-    if not s:
-        return nv
-    return '{s}&{nv}'.format(s=s, nv=nv)
-
 
 class CloudZoneBucket:
     def __init__(self, zone_conn, target_path, name):