From 87a542ff1050766856a1a5dc03340d00b32f5541 Mon Sep 17 00:00:00 2001 From: abhishekkekane Date: Thu, 28 Jan 2016 02:23:33 -0800 Subject: [PATCH] Add python 3 support Replaced iter.next() with next(iter) Replaced __builtin__ with six.moves.builtin Replaced unicode with six.text_type Repleaced Configparser with six.moves.configparser Blueprint magnum-python3 Change-Id: I9f084ef4fae1ec1111e26142e2e89bad18acbf45 --- magnum/common/pythonk8sclient/swagger_client/api_client.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/magnum/common/pythonk8sclient/swagger_client/api_client.py b/magnum/common/pythonk8sclient/swagger_client/api_client.py index b4e62af..dd7a62a 100644 --- a/magnum/common/pythonk8sclient/swagger_client/api_client.py +++ b/magnum/common/pythonk8sclient/swagger_client/api_client.py @@ -33,6 +33,7 @@ from datetime import datetime from datetime import date # python 2 and python 3 compatibility library +import six from six import iteritems import six.moves.builtins as __builtin__ from six.moves.urllib import parse as urlparse @@ -184,7 +185,7 @@ class ApiClient(object): """ if isinstance(obj, type(None)): return None - elif isinstance(obj, (unicode, str, int, float, bool, tuple, file)): + elif isinstance(obj, (six.text_type, str, int, float, bool, tuple, file)): return obj elif isinstance(obj, list): return [self.sanitize_for_serialization(sub_obj) @@ -488,7 +489,7 @@ class ApiClient(object): try: value = klass(data) except UnicodeEncodeError: - value = unicode(data) + value = six.text_type(data) except TypeError: value = data return value