test/rgw: drop use of urllib

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/test/rgw/rgw_multi/tests_es.py b/src/test/rgw/rgw_multi/tests_es.py
index e313018b6f8070a3b00b16df0e9374443013dd47..bc9f67b73a079ca21e6fe8c19e3b26f8f1bdb005 100644 (file)
--- a/src/test/rgw/rgw_multi/tests_es.py
+++ b/src/test/rgw/rgw_multi/tests_es.py
@@ -1,5 +1,4 @@
 import json
-import urllib
 import logging
 
 import boto

diff --git a/src/test/rgw/rgw_multi/zone_es.py b/src/test/rgw/rgw_multi/zone_es.py
index fcb9454ec32d4f5b654fb1a944a6d592efaa561a..d57ca742c6e0a3cc34df10b3db736c5f9e0b6d1d 100644 (file)
--- a/src/test/rgw/rgw_multi/zone_es.py
+++ b/src/test/rgw/rgw_multi/zone_es.py
@@ -1,5 +1,5 @@
 import json
-import urllib
+import requests.compat
 import logging
 
 import boto
@@ -75,7 +75,7 @@ class MDSearch:
 
     def raw_search(self):
         q = self.query or ''
-        query_args = append_query_arg(self.query_args, 'query', urllib.quote_plus(q))
+        query_args = append_query_arg(self.query_args, 'query', requests.compat.quote_plus(q))
         if self.max_keys is not None:
             query_args = append_query_arg(query_args, 'max-keys', self.max_keys)
         if self.marker: