From 674e63b853ba75136f2ac0cc1947b5471f8991fc Mon Sep 17 00:00:00 2001 From: "Swapnil Kulkarni (coolsvap)" Date: Thu, 24 Dec 2015 12:05:37 +0530 Subject: [PATCH] Keep py3.X compatibility for urllib Change-Id: If6c1b016c726070b5b326296ead933cbd74bd408 Partial-Bug:#1280105 --- .../pythonk8sclient/swagger_client/api_client.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/magnum/common/pythonk8sclient/swagger_client/api_client.py b/magnum/common/pythonk8sclient/swagger_client/api_client.py index ea0c736..cb76363 100644 --- a/magnum/common/pythonk8sclient/swagger_client/api_client.py +++ b/magnum/common/pythonk8sclient/swagger_client/api_client.py @@ -24,7 +24,6 @@ from .rest import ApiException import os import re -import urllib import json import mimetypes import random @@ -36,13 +35,7 @@ from datetime import date # python 2 and python 3 compatibility library from six import iteritems - -try: - # for python3 - from urllib.parse import quote -except ImportError: - # for python2 - from urllib import quote +from six.moves.urllib import parse as urlparse from .configuration import Configuration @@ -116,7 +109,7 @@ class ApiClient(object): if path_params: path_params = self.sanitize_for_serialization(path_params) for k, v in iteritems(path_params): - replacement = quote(str(self.to_path_value(v))) + replacement = urlparse.quote(str(self.to_path_value(v))) resource_path = resource_path.\ replace('{' + k + '}', replacement)