openstack
/
tempest
Code Issues Proposed changes

Keep py3.X compatibility for urllib.urlencode 

For py3.X, urllib has no attr urlencode while python 2 has.
Change urlencode to keep compatibility.

Change-Id: I9fc041d6fd8b65d0a19f38ae1915dcb2a1b42553
Partial-Bug: #1280105
This commit is contained in:
Harshada Mangesh Kakad 2015-12-22 09:46:48 -08:00
parent 96d8025ae0
commit 71f6b97480
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tempest/services/database/json/flavors_client.py
View File

@ -14,7 +14,7 @@
# under the License. # under the License.
from oslo_serialization import jsonutils as json from oslo_serialization import jsonutils as json
import urllib from six.moves import urllib
from tempest.common import service_client from tempest.common import service_client
@ -24,7 +24,7 @@ class DatabaseFlavorsClient(service_client.ServiceClient):
def list_db_flavors(self, params=None): def list_db_flavors(self, params=None):
url = 'flavors' url = 'flavors'
if params: if params:
url += '?%s' % urllib.urlencode(params) url += '?%s' % urllib.parse.urlencode(params)
resp, body = self.get(url) resp, body = self.get(url)
self.expected_success(200, resp.status) self.expected_success(200, resp.status)

4
tempest/test.py
View File

@ -19,7 +19,6 @@ import os
import re import re
import sys import sys
import time import time
import urllib
import uuid import uuid
import fixtures import fixtures
@ -27,6 +26,7 @@ from oslo_log import log as logging
from oslo_serialization import jsonutils as json from oslo_serialization import jsonutils as json
from oslo_utils import importutils from oslo_utils import importutils
import six import six
from six.moves import urllib
from tempest_lib import decorators from tempest_lib import decorators
import testscenarios import testscenarios
import testtools import testtools
@ -770,7 +770,7 @@ class NegativeAutoTest(BaseTestCase):
if not json_dict: if not json_dict:
return url, None return url, None
elif method in ["GET", "HEAD", "PUT", "DELETE"]: elif method in ["GET", "HEAD", "PUT", "DELETE"]:
return "%s?%s" % (url, urllib.urlencode(json_dict)), None return "%s?%s" % (url, urllib.parse.urlencode(json_dict)), None
else: else:
return url, json.dumps(json_dict) return url, json.dumps(json_dict)