From 18027816d39743184e45b86371573e574fb12a99 Mon Sep 17 00:00:00 2001 From: Fengqian Gao Date: Fri, 14 Feb 2014 16:12:10 +0800 Subject: [PATCH] Keep py3.X compatibility for urllib.urlencode For py3.X, urllib has no attr urlencode while python 2 has. Change urlencode to keep compatibility. Partial-Bug: #1280105 Change-Id: I2c0447af3206cdfc55ba22748b2793de8eb94cfb --- ceilometer/tests/api/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ceilometer/tests/api/__init__.py b/ceilometer/tests/api/__init__.py index 6326ba7e12..b8b441e9ba 100644 --- a/ceilometer/tests/api/__init__.py +++ b/ceilometer/tests/api/__init__.py @@ -18,11 +18,10 @@ """Base classes for API tests. """ -import urllib - import flask import pecan import pecan.testing +from six.moves import urllib from ceilometer.api import acl from ceilometer.api.v1 import app as v1_app @@ -61,7 +60,7 @@ class TestBase(db_test_base.TestBase): def get(self, path, headers=None, **kwds): if kwds: - query = path + '?' + urllib.urlencode(kwds) + query = path + '?' + urllib.parse.urlencode(kwds) else: query = path rv = self.test_app.get(query, headers=headers)