chore: Minor cleanup

Author: jsonbailey

ldclient/impl/datasource/feature_requester.py

@@ -13,7 +13,7 @@
 from ldclient.interfaces import FeatureRequester
 from ldclient.versioned_data_kind import FEATURES, SEGMENTS
 
-LATEST_ALL_URI = '/sdk/latest-all'
+FDV1_POLLING_ENDPOINT = '/sdk/latest-all'
 
 
 CacheEntry = namedtuple('CacheEntry', ['data', 'etag'])
@@ -24,7 +24,7 @@ def __init__(self, config):
         self._cache = dict()
         self._http = _http_factory(config).create_pool_manager(1, config.base_uri)
         self._config = config
-        self._poll_uri = config.base_uri + LATEST_ALL_URI
+        self._poll_uri = config.base_uri + FDV1_POLLING_ENDPOINT
         if config.payload_filter_key is not None:
             self._poll_uri += '?%s' % parse.urlencode({'filter': config.payload_filter_key})
 

ldclient/impl/datasourcev2/polling.py

@@ -14,14 +14,13 @@
 import urllib3
 
 from ldclient.config import Config
-from ldclient.impl.datasource.feature_requester import LATEST_ALL_URI
+from ldclient.impl.datasource.feature_requester import FDV1_POLLING_ENDPOINT
 from ldclient.impl.datasystem.protocolv2 import (
     DeleteObject,
     EventName,
     PutObject
 )
 from ldclient.impl.http import _http_factory
-from ldclient.impl.repeating_task import RepeatingTask
 from ldclient.impl.util import (
     _LD_ENVID_HEADER,
     _LD_FD_FALLBACK_HEADER,
@@ -52,7 +51,7 @@
     Update
 )
 
-POLLING_ENDPOINT = "/sdk/poll"
+FDV2_POLLING_ENDPOINT = "/sdk/poll"
 
 
 PollingResult = _Result[Tuple[ChangeSet, Mapping], str]
@@ -93,11 +92,8 @@ def __init__(
     ):
         self._requester = requester
         self._poll_interval = poll_interval
-        self._event = Event()
+        self._interrupt_event = Event()
         self._stop = Event()
-        self._task = RepeatingTask(
-            "ldclient.datasource.polling", poll_interval, 0, self._poll
-        )
 
     @property
     def name(self) -> str:
@@ -117,6 +113,7 @@ def sync(self, ss: SelectorStore) -> Generator[Update, None, None]:
         occurs.
         """
         log.info("Starting PollingDataSourceV2 synchronizer")
+        self._interrupt_event.clear()
         self._stop.clear()
         while self._stop.is_set() is False:
             result = self._requester.fetch(ss.selector())
@@ -184,14 +181,13 @@ def sync(self, ss: SelectorStore) -> Generator[Update, None, None]:
                     revert_to_fdv1=headers.get(_LD_FD_FALLBACK_HEADER) == 'true'
                 )
 
-            if self._event.wait(self._poll_interval):
+            if self._interrupt_event.wait(self._poll_interval):
                 break
 
     def stop(self):
         """Stops the synchronizer."""
         log.info("Stopping PollingDataSourceV2 synchronizer")
-        self._event.set()
-        self._task.stop()
+        self._interrupt_event.set()
         self._stop.set()
 
     def _poll(self, ss: SelectorStore) -> BasisResult:
@@ -247,7 +243,7 @@ def __init__(self, config: Config):
         self._etag = None
         self._http = _http_factory(config).create_pool_manager(1, config.base_uri)
         self._config = config
-        self._poll_uri = config.base_uri + POLLING_ENDPOINT
+        self._poll_uri = config.base_uri + FDV2_POLLING_ENDPOINT
 
     def fetch(self, selector: Optional[Selector]) -> PollingResult:
         """
@@ -413,7 +409,7 @@ def __init__(self, config: Config):
         self._etag = None
         self._http = _http_factory(config).create_pool_manager(1, config.base_uri)
         self._config = config
-        self._poll_uri = config.base_uri + LATEST_ALL_URI
+        self._poll_uri = config.base_uri + FDV1_POLLING_ENDPOINT
 
     def fetch(self, selector: Optional[Selector]) -> PollingResult:
         """

ldclient/impl/datasystem/store.py

@@ -111,7 +111,6 @@ def apply_delta(self, collections: Collections) -> bool:
             with self._lock.write():
                 for kind, kind_data in all_decoded.items():
                     items_of_kind = self._items[kind]
-                    kind_data = all_decoded[kind]
                     for key, item in kind_data.items():
                         items_of_kind[key] = item
                         log.debug(

ldclient/integrations/test_data.py

@@ -153,7 +153,7 @@ def __init__(self, key: str):
     # consider it part of the public API, but it is still called from TestData.
     def _copy(self) -> 'FlagBuilder':
         """Creates a deep copy of the flag builder. Subsequent updates to the
-        original ``FlagBuilder`` object will not update the copy and vise versa.
+        original ``FlagBuilder`` object will not update the copy and vice versa.
 
         :return: a copy of the flag builder object
         """

ldclient/integrations/test_datav2.py

@@ -182,7 +182,7 @@ def __init__(self, key: str):
     def _copy(self) -> FlagBuilderV2:
         """
         Creates a deep copy of the flag builder. Subsequent updates to the
-        original ``FlagBuilderV2`` object will not update the copy and vise versa.
+        original ``FlagBuilderV2`` object will not update the copy and vice versa.
 
         :return: a copy of the flag builder object
         """