Merge "Migrate to Kubernetes Release 1"

This commit is contained in:
Jenkins 2015-09-22 05:02:45 +00:00 committed by Gerrit Code Review
commit 669d2c81cc

View File

@ -187,7 +187,7 @@ class ApiClient(object):
"""
if isinstance(obj, type(None)):
return None
elif isinstance(obj, (str, int, float, bool, tuple)):
elif isinstance(obj, (unicode, str, int, float, bool, tuple, file)):
return obj
elif isinstance(obj, list):
return [self.sanitize_for_serialization(sub_obj)