Skip to content

Commit 71b0b1e

Browse files
Address code review: remove unused SimpleNamespace import, extract excluded_params set
Co-authored-by: brendandburns <5751682+brendandburns@users.noreply.github.com>
1 parent 5ff0982 commit 71b0b1e

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

kubernetes/base/watch/watch.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,18 +194,17 @@ def stream(self, func, *args, **kwargs):
194194
# after a 410 uses a valid, recent resourceVersion rather than a
195195
# potentially stale one from an individual resource event.
196196
if watch_arg == 'watch' and self.resource_version is None:
197+
_list_excluded = {watch_arg, '_preload_content',
198+
'allow_watch_bookmarks', 'timeout_seconds'}
197199
list_kwargs = {k: v for k, v in kwargs.items()
198-
if k not in (watch_arg, '_preload_content',
199-
'allow_watch_bookmarks',
200-
'timeout_seconds')}
200+
if k not in _list_excluded}
201201
initial_list = func(*args, **list_kwargs)
202202
if (hasattr(initial_list, 'metadata')
203203
and hasattr(initial_list.metadata, 'resource_version')
204204
and isinstance(
205205
initial_list.metadata.resource_version, str)
206206
and initial_list.metadata.resource_version):
207-
self.resource_version = \
208-
initial_list.metadata.resource_version
207+
self.resource_version = initial_list.metadata.resource_version
209208
kwargs['resource_version'] = self.resource_version
210209
if (hasattr(initial_list, 'items')
211210
and isinstance(initial_list.items, list)):

kubernetes/base/watch/watch_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import os
1616
import time
1717
import unittest
18-
from types import SimpleNamespace
1918
from unittest.mock import Mock, call
2019

2120
from kubernetes import client, config

0 commit comments

Comments
 (0)