x/python-k8sclient
Code Issues Proposed changes

Get tests working in py34

Browse Source
This commit is contained in:
Davanum Srinivas 2016-04-01 17:26:32 -04:00
parent 4d13215b5b
commit 9fd934047d
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
k8sclient/client/api_client.py
View File

@ -40,6 +40,12 @@ from six.moves.urllib import parse as urlparse
from .configuration import Configuration from .configuration import Configuration
if six.PY3:
import io
file_type = io.IOBase
else:
file_type = file
class ApiClient(object): class ApiClient(object):
""" """
@ -185,7 +191,8 @@ class ApiClient(object):
""" """
if isinstance(obj, type(None)): if isinstance(obj, type(None)):
return None return None
elif isinstance(obj, (six.text_type, str, int, float, bool, tuple, file)): elif isinstance(obj, (six.text_type, str, int, float,
bool, tuple, file_type)):
return obj return obj
elif isinstance(obj, list): elif isinstance(obj, list):
return [self.sanitize_for_serialization(sub_obj) return [self.sanitize_for_serialization(sub_obj)

1
requirements.txt
View File

@ -3,4 +3,5 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
pbr>=1.6 pbr>=1.6
six>=1.9.0 # MIT
urllib3>=1.8.3 # MIT urllib3>=1.8.3 # MIT

1
setup.cfg
View File

@ -16,7 +16,6 @@ classifier =
Programming Language :: Python :: 2 Programming Language :: Python :: 2
Programming Language :: Python :: 2.7 Programming Language :: Python :: 2.7
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.3
Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.4
[files] [files]