Skip to content

Commit 36fbfea

Browse files
committed
Force apply autopep8
As required by contributing documentation
1 parent 01ae336 commit 36fbfea

25 files changed

Lines changed: 830 additions & 344 deletions

kubernetes/base/config/__init__.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@
1616

1717
from .config_exception import ConfigException
1818
from .incluster_config import load_incluster_config
19-
from .kube_config import (KUBE_CONFIG_DEFAULT_LOCATION,
20-
list_kube_config_contexts, load_kube_config,
21-
load_kube_config_from_dict, new_client_from_config, new_client_from_config_dict)
19+
from .kube_config import (
20+
KUBE_CONFIG_DEFAULT_LOCATION,
21+
list_kube_config_contexts,
22+
load_kube_config,
23+
load_kube_config_from_dict,
24+
new_client_from_config,
25+
new_client_from_config_dict)
2226

2327

2428
def load_config(**kwargs):

kubernetes/base/config/dateutil.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,24 @@ def parse_rfc3339(s):
5252
if not s.tzinfo:
5353
return s.replace(tzinfo=UTC)
5454
return s
55-
55+
5656
m = _re_rfc3339.fullmatch(s.strip())
5757
if m is None:
5858
raise ValueError(
5959
f"Invalid RFC3339 datetime: {s!r} "
6060
"(expected YYYY-MM-DDTHH:MM:SS[.frac][Z|±HH:MM])"
6161
)
62-
62+
6363
groups = m.groups()
6464
dt = [0] * 7
6565
for x in range(6):
6666
dt[x] = int(groups[x])
67-
67+
6868
us = 0
6969
if groups[6] is not None:
7070
partial_sec = float(groups[6].replace(",", "."))
7171
us = int(MICROSEC_PER_SEC * partial_sec)
72-
72+
7373
tz = UTC
7474
if groups[7] is not None and groups[7] not in ('Z', 'z', ' '):
7575
tz_match = _re_timezone.search(groups[7])
@@ -87,7 +87,7 @@ def parse_rfc3339(s):
8787
if tz_groups[2]:
8888
minute = int(tz_groups[2])
8989
tz = TimezoneInfo(hour, minute)
90-
90+
9191
try:
9292
return datetime.datetime(
9393
year=dt[0], month=dt[1], day=dt[2],
@@ -99,7 +99,6 @@ def parse_rfc3339(s):
9999
) from e
100100

101101

102-
103102
def format_rfc3339(date_time):
104103
if date_time.tzinfo is None:
105104
date_time = date_time.replace(tzinfo=UTC)

kubernetes/base/config/dateutil_test.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ def test_parse_rfc3339_invalid_formats(self):
8484
with self.assertRaises(ValueError):
8585
parse_rfc3339(invalid_input)
8686

87-
88-
8987
def test_parse_rfc3339_with_whitespace(self):
9088
"""Test that leading/trailing whitespace is handled"""
9189
actual = parse_rfc3339(" 2017-07-25T04:44:21Z ")

kubernetes/base/config/exec_provider.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def __init__(self, exec_config, cwd, cluster=None):
5858
else:
5959
self.cluster = None
6060
self.cwd = cwd or None
61-
61+
6262
@property
6363
def shell(self):
6464
# for windows systems `shell` should be `True`

kubernetes/base/config/exec_provider_test.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,10 @@ def test_with_cluster_info(self, mock):
175175
instance = mock.return_value
176176
instance.wait.return_value = 0
177177
instance.communicate.return_value = (self.output_ok, '')
178-
ep = ExecProvider(self.input_with_cluster, None, ConfigNode("cluster", {'server': 'name.company.com'}))
178+
ep = ExecProvider(
179+
self.input_with_cluster, None, ConfigNode(
180+
"cluster", {
181+
'server': 'name.company.com'}))
179182
result = ep.run()
180183
self.assertTrue(isinstance(result, dict))
181184
self.assertTrue('token' in result)
@@ -213,8 +216,10 @@ def test_with_cluster_info_from_exec_extension(self, mock):
213216

214217
obj = json.loads(mock.call_args.kwargs["env"]["KUBERNETES_EXEC_INFO"])
215218
self.assertEqual(obj["spec"]["cluster"]["server"], "name.company.com")
216-
self.assertEqual(obj["spec"]["cluster"]["config"]["namespace"], "myproject")
219+
self.assertEqual(obj["spec"]["cluster"]["config"]
220+
["namespace"], "myproject")
217221
self.assertEqual(obj["spec"]["cluster"]["config"]["name"], "mycluster")
218222

223+
219224
if __name__ == '__main__':
220225
unittest.main()

kubernetes/base/config/kube_config.py

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
google_auth_available = False
4444

4545

46-
4746
EXPIRY_SKEW_PREVENTION_DELAY = datetime.timedelta(minutes=5)
4847
KUBE_CONFIG_DEFAULT_LOCATION = os.environ.get('KUBECONFIG', '~/.kube/config')
4948
ENV_KUBECONFIG_PATH_SEPARATOR = ';' if platform.system() == 'Windows' else ':'
@@ -60,7 +59,10 @@ def _cleanup_temp_files():
6059
_temp_files = {}
6160

6261

63-
def _create_temp_file_with_content(content, temp_file_path=None, force_recreate=False):
62+
def _create_temp_file_with_content(
63+
content,
64+
temp_file_path=None,
65+
force_recreate=False):
6466
if len(_temp_files) == 0:
6567
atexit.register(_cleanup_temp_files)
6668
# Because we may change context several times, try to remember files we
@@ -143,7 +145,9 @@ def _write_file(self, force_rewrite=False):
143145
else:
144146
content = self._data
145147
self._file = _create_temp_file_with_content(
146-
base64.standard_b64decode(content), self._temp_file_path, force_recreate=force_rewrite)
148+
base64.standard_b64decode(content),
149+
self._temp_file_path,
150+
force_recreate=force_rewrite)
147151
else:
148152
self._file = _create_temp_file_with_content(
149153
self._data, self._temp_file_path, force_recreate=force_rewrite)
@@ -245,7 +249,7 @@ def _refresh_credentials():
245249
'config' in self._user['auth-provider'] and
246250
'cmd-path' in self._user['auth-provider']['config']):
247251
return _refresh_credentials_with_cmd_path()
248-
252+
249253
# Make the Google auth block optional.
250254
if google_auth_available:
251255
credentials, project_id = google.auth.default(scopes=[
@@ -257,7 +261,7 @@ def _refresh_credentials():
257261
return credentials
258262
else:
259263
return None
260-
264+
261265
if get_google_credentials:
262266
self._get_google_credentials = get_google_credentials
263267
else:
@@ -314,8 +318,6 @@ def _load_auth_provider_token(self):
314318
if provider['name'] == 'oidc':
315319
return self._load_oid_token(provider)
316320

317-
318-
319321
def _load_gcp_token(self, provider):
320322
if (('config' not in provider) or
321323
('access-token' not in provider['config']) or
@@ -442,7 +444,10 @@ def _load_from_exec_plugin(self):
442444
return
443445
try:
444446
base_path = self._get_base_path(self._cluster.path)
445-
status = ExecProvider(self._user['exec'], base_path, self._cluster).run()
447+
status = ExecProvider(
448+
self._user['exec'],
449+
base_path,
450+
self._cluster).run()
446451
if 'token' in status:
447452
self.token = "Bearer %s" % status['token']
448453
elif 'clientCertificateData' in status:
@@ -535,7 +540,13 @@ def _refresh_api_key(client_configuration):
535540
self._set_config(client_configuration)
536541
client_configuration.refresh_api_key_hook = _refresh_api_key
537542
# copy these keys directly from self to configuration object
538-
keys = ['host', 'ssl_ca_cert', 'cert_file', 'key_file', 'verify_ssl','tls_server_name']
543+
keys = [
544+
'host',
545+
'ssl_ca_cert',
546+
'cert_file',
547+
'key_file',
548+
'verify_ssl',
549+
'tls_server_name']
539550
for key in keys:
540551
if key in self.__dict__:
541552
setattr(client_configuration, key, getattr(self, key))

kubernetes/base/config/kube_config_test.py

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,22 @@
3030

3131
from .config_exception import ConfigException
3232
from .dateutil import UTC, format_rfc3339, parse_rfc3339
33-
from .kube_config import (ENV_KUBECONFIG_PATH_SEPARATOR, CommandTokenSource,
34-
ConfigNode, FileOrData, KubeConfigLoader,
35-
KubeConfigMerger, _cleanup_temp_files,
36-
_create_temp_file_with_content,
37-
_get_kube_config_loader,
38-
_get_kube_config_loader_for_yaml_file,
39-
list_kube_config_contexts, load_kube_config,
40-
load_kube_config_from_dict, new_client_from_config, new_client_from_config_dict)
33+
from .kube_config import (
34+
ENV_KUBECONFIG_PATH_SEPARATOR,
35+
CommandTokenSource,
36+
ConfigNode,
37+
FileOrData,
38+
KubeConfigLoader,
39+
KubeConfigMerger,
40+
_cleanup_temp_files,
41+
_create_temp_file_with_content,
42+
_get_kube_config_loader,
43+
_get_kube_config_loader_for_yaml_file,
44+
list_kube_config_contexts,
45+
load_kube_config,
46+
load_kube_config_from_dict,
47+
new_client_from_config,
48+
new_client_from_config_dict)
4149

4250
BEARER_TOKEN_FORMAT = "Bearer %s"
4351

@@ -88,10 +96,10 @@ def _raise_exception(st):
8896
TEST_PASSWORD = "pass"
8997
# token for me:pass
9098
TEST_BASIC_TOKEN = "Basic bWU6cGFzcw=="
91-
DATETIME_EXPIRY_PAST = datetime.datetime.now(tz=UTC
92-
).replace(tzinfo=None) - datetime.timedelta(minutes=PAST_EXPIRY_TIMEDELTA)
93-
DATETIME_EXPIRY_FUTURE = datetime.datetime.now(tz=UTC
94-
).replace(tzinfo=None) + datetime.timedelta(minutes=FUTURE_EXPIRY_TIMEDELTA)
99+
DATETIME_EXPIRY_PAST = datetime.datetime.now(tz=UTC).replace(
100+
tzinfo=None) - datetime.timedelta(minutes=PAST_EXPIRY_TIMEDELTA)
101+
DATETIME_EXPIRY_FUTURE = datetime.datetime.now(tz=UTC).replace(
102+
tzinfo=None) + datetime.timedelta(minutes=FUTURE_EXPIRY_TIMEDELTA)
95103
TEST_TOKEN_EXPIRY_PAST = _format_expiry_datetime(DATETIME_EXPIRY_PAST)
96104

97105
TEST_SSL_HOST = "https://test-host"
@@ -995,7 +1003,8 @@ def test_oidc_with_refresh(self, mock_ApiClient, mock_OAuth2Session):
9951003

9961004
@mock.patch('kubernetes.config.kube_config.OAuth2Session.refresh_token')
9971005
@mock.patch('kubernetes.config.kube_config.ApiClient.request')
998-
def test_oidc_with_idp_ca_file_refresh(self, mock_ApiClient, mock_OAuth2Session):
1006+
def test_oidc_with_idp_ca_file_refresh(
1007+
self, mock_ApiClient, mock_OAuth2Session):
9991008
mock_response = mock.MagicMock()
10001009
type(mock_response).status = mock.PropertyMock(
10011010
return_value=200
@@ -1065,7 +1074,6 @@ def test_oidc_fails_if_invalid_padding_length(self):
10651074
None,
10661075
)
10671076

1068-
10691077
def test_user_pass(self):
10701078
expected = FakeConfig(host=TEST_HOST, token=TEST_BASIC_TOKEN)
10711079
actual = FakeConfig()

0 commit comments

Comments
 (0)