From b6b461b895c14fe1013815ee351eaf493cec4f14 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 22 Apr 2016 14:45:02 -0400 Subject: [PATCH] Keep py3.X compatibility for urllib Copied from If6c1b016c726070b5b326296ead933cbd74bd408 Change-Id: I971f1f587ef5b3cf4d81325ee3731a9ec6dadfaf --- k8sclient/client/api_client.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/k8sclient/client/api_client.py b/k8sclient/client/api_client.py index 4e01463..f275fb2 100644 --- a/k8sclient/client/api_client.py +++ b/k8sclient/client/api_client.py @@ -24,7 +24,6 @@ from .rest import ApiException import ast 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)