kubernetes-client/python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert black and only try autopep8 this time

Browse Source
This commit is contained in:
Moshe Shitrit 2021-03-21 23:44:32 -04:00
parent 34b8304d5f
commit 0a5b04feea
2 changed files with 33 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
config/__init__.py
View File

@ -15,13 +15,8 @@
import os
from .config_exception import ConfigException
from .incluster_config import load_incluster_config
from .kube_config import (
list_kube_config_contexts,
load_kube_config,
load_kube_config_from_dict,
new_client_from_config,
KUBE_CONFIG_DEFAULT_LOCATION,
)
from .kube_config import (list_kube_config_contexts, load_kube_config,
load_kube_config_from_dict, new_client_from_config, KUBE_CONFIG_DEFAULT_LOCATION)
def load_config(**kwargs):
@ -33,15 +28,9 @@ def load_config(**kwargs):
:param kwargs: A combination of all possible kwargs that can be passed to either load_kube_config or
load_incluster_config functions.
"""
if "kube_config_path" in kwargs.keys() or os.path.exists(
KUBE_CONFIG_DEFAULT_LOCATION
):
if "kube_config_path" in kwargs.keys() or os.path.exists(KUBE_CONFIG_DEFAULT_LOCATION):
load_kube_config(**kwargs)
else:
print(
"kube_config_path not provided and default location ({0}) does not exist. "
"Using inCluster Config. This might not work.".format(
KUBE_CONFIG_DEFAULT_LOCATION
)
)
print("kube_config_path not provided and default location ({0}) does not exist. "
"Using inCluster Config. This might not work.".format(KUBE_CONFIG_DEFAULT_LOCATION))
load_incluster_config(**kwargs)

61
watch/watch.py
View File

@ -32,15 +32,14 @@ TYPE_LIST_SUFFIX = "List"
PY2 = sys.version_info[0] == 2
if PY2:
import httplib
HTTP_STATUS_GONE = httplib.GONE
else:
import http
HTTP_STATUS_GONE = http.HTTPStatus.GONE
class SimpleNamespace:
def __init__(self, **kwargs):
self.__dict__.update(kwargs)
@ -56,7 +55,7 @@ def iter_resp_lines(resp):
prev = ""
for seg in resp.read_chunked(decode_content=False):
if isinstance(seg, bytes):
seg = seg.decode("utf8")
seg = seg.decode('utf8')
seg = prev + seg
lines = seg.split("\n")
if not seg.endswith("\n"):
@ -70,6 +69,7 @@ def iter_resp_lines(resp):
class Watch(object):
def __init__(self, return_type=None):
self._raw_return_type = return_type
self._stop = False
@ -84,31 +84,29 @@ class Watch(object):
return self._raw_return_type
return_type = _find_return_type(func)
if return_type.endswith(TYPE_LIST_SUFFIX):
return return_type[: -len(TYPE_LIST_SUFFIX)]
return return_type[:-len(TYPE_LIST_SUFFIX)]
return return_type
def get_watch_argument_name(self, func):
if PYDOC_FOLLOW_PARAM in pydoc.getdoc(func):
return "follow"
return 'follow'
else:
return "watch"
return 'watch'
def unmarshal_event(self, data, return_type):
js = json.loads(data)
js["raw_object"] = js["object"]
if return_type and js["type"] != "ERROR":
obj = SimpleNamespace(data=json.dumps(js["raw_object"]))
js["object"] = self._api_client.deserialize(obj, return_type)
if hasattr(js["object"], "metadata"):
self.resource_version = js["object"].metadata.resource_version
js['raw_object'] = js['object']
if return_type and js['type'] != 'ERROR':
obj = SimpleNamespace(data=json.dumps(js['raw_object']))
js['object'] = self._api_client.deserialize(obj, return_type)
if hasattr(js['object'], 'metadata'):
self.resource_version = js['object'].metadata.resource_version
# For custom objects that we don't have model defined, json
# deserialization results in dictionary
elif (
isinstance(js["object"], dict)
and "metadata" in js["object"]
and "resourceVersion" in js["object"]["metadata"]
):
self.resource_version = js["object"]["metadata"]["resourceVersion"]
elif (isinstance(js['object'], dict) and 'metadata' in js['object']
and 'resourceVersion' in js['object']['metadata']):
self.resource_version = js['object']['metadata'][
'resourceVersion']
return js
def stream(self, func, *args, **kwargs):
@ -149,13 +147,13 @@ class Watch(object):
return_type = self.get_return_type(func)
watch_arg = self.get_watch_argument_name(func)
kwargs[watch_arg] = True
kwargs["_preload_content"] = False
if "resource_version" in kwargs:
self.resource_version = kwargs["resource_version"]
kwargs['_preload_content'] = False
if 'resource_version' in kwargs:
self.resource_version = kwargs['resource_version']
# Do not attempt retries if user specifies a timeout.
# We want to ensure we are returning within that timeout.
disable_retries = "timeout_seconds" in kwargs
disable_retries = ('timeout_seconds' in kwargs)
retry_after_410 = False
while True:
resp = func(*args, **kwargs)
@ -165,23 +163,20 @@ class Watch(object):
# return raw string when we are streaming log
if watch_arg == "watch":
event = self.unmarshal_event(line, return_type)
if isinstance(event, dict) and event["type"] == "ERROR":
obj = event["raw_object"]
if isinstance(event, dict) \
and event['type'] == 'ERROR':
obj = event['raw_object']
# Current request expired, let's retry, (if enabled)
# but only if we have not already retried.
if (
not disable_retries
and not retry_after_410
and obj["code"] == HTTP_STATUS_GONE
):
if not disable_retries and not retry_after_410 and \
obj['code'] == HTTP_STATUS_GONE:
retry_after_410 = True
break
else:
reason = "%s: %s" % (
obj["reason"], obj["message"])
obj['reason'], obj['message'])
raise client.rest.ApiException(
status=obj["code"], reason=reason
)
status=obj['code'], reason=reason)
else:
retry_after_410 = False
yield event
@ -193,7 +188,7 @@ class Watch(object):
resp.close()
resp.release_conn()
if self.resource_version is not None:
kwargs["resource_version"] = self.resource_version
kwargs['resource_version'] = self.resource_version
else:
self._stop = True