Fix some warnings

Author: HardNorth

reportportal_client/__init__.py

@@ -13,7 +13,6 @@
 
 """This package is the base package for ReportPortal client."""
 import typing
-import warnings
 
 import aenum
 
@@ -101,7 +100,7 @@ def create_client(
         return ThreadedRPClient(endpoint, project, api_key=api_key, **kwargs)
     if client_type is ClientType.ASYNC_BATCHED:
         return BatchedRPClient(endpoint, project, api_key=api_key, **kwargs)
-    warnings.warn(f"Unknown ReportPortal Client type requested: {client_type}", RuntimeWarning, stacklevel=2)
+    raise ValueError(f"Unknown ReportPortal Client type requested: {client_type}")
 
 
 __all__ = [

reportportal_client/_internal/aio/tasks.py

@@ -177,20 +177,24 @@ def append(self, value: _T) -> Optional[List[_T]]:
         :return: a batch or None
         """
         self.__task_list.append(value)
-        if self.__ready_to_run():
-            tasks = self.__task_list
-            self.__task_list = []
-            return tasks
+        if not self.__ready_to_run():
+            return None
+
+        tasks = self.__task_list
+        self.__task_list = []
+        return tasks
 
     def flush(self) -> Optional[List[_T]]:
         """Immediately return everything what's left in the internal batch.
 
         :return: a batch or None
         """
-        if len(self.__task_list) > 0:
-            tasks = self.__task_list
-            self.__task_list = []
-            return tasks
+        if len(self.__task_list) <= 0:
+            return None
+
+        tasks = self.__task_list
+        self.__task_list = []
+        return tasks
 
 
 class BackgroundTaskList(Generic[_T]):
@@ -224,7 +228,9 @@ def flush(self) -> Optional[List[_T]]:
         :return: a batch or None
         """
         self.__remove_finished()
-        if len(self.__task_list) > 0:
-            tasks = self.__task_list
-            self.__task_list = []
-            return tasks
+        if len(self.__task_list) <= 0:
+            return None
+
+        tasks = self.__task_list
+        self.__task_list = []
+        return tasks

reportportal_client/_internal/local/__init__.py

@@ -22,6 +22,7 @@ def current():
     """Return current ReportPortal client."""
     if hasattr(__INSTANCES, "current"):
         return __INSTANCES.current
+    return None
 
 
 def set_current(client):

reportportal_client/_internal/logs/batcher.py

@@ -50,7 +50,7 @@ def __init__(self, entry_num=MAX_LOG_BATCH_SIZE, payload_limit=MAX_LOG_BATCH_PAY
         self._batch = []
         self._payload_size = 0
 
-    def _append(self, size: int, log_req: T_co) -> Optional[List[T_co]]:
+    def _append(self, size: int, log_req: RPRequestLog) -> Optional[List[RPRequestLog]]:
         with self._lock:
             if self._payload_size + size >= self.payload_limit:
                 if len(self._batch) > 0:
@@ -60,11 +60,13 @@ def _append(self, size: int, log_req: T_co) -> Optional[List[T_co]]:
                     return batch
             self._batch.append(log_req)
             self._payload_size += size
-            if len(self._batch) >= self.entry_num:
-                batch = self._batch
-                self._batch = []
-                self._payload_size = 0
-                return batch
+            if len(self._batch) < self.entry_num:
+                return None
+
+            batch = self._batch
+            self._batch = []
+            self._payload_size = 0
+            return batch
 
     def append(self, log_req: RPRequestLog) -> Optional[List[RPRequestLog]]:
         """Add a log request object to internal batch and return the batch if it's full.
@@ -87,12 +89,15 @@ def flush(self) -> Optional[List[T_co]]:
 
         :return: a batch or None
         """
+        if len(self._batch) <= 0:
+            return None
         with self._lock:
-            if len(self._batch) > 0:
-                batch = self._batch
-                self._batch = []
-                self._payload_size = 0
-                return batch
+            if len(self._batch) <= 0:
+                return None
+            batch = self._batch
+            self._batch = []
+            self._payload_size = 0
+            return batch
 
     def __getstate__(self) -> Dict[str, Any]:
         """Control object pickling and return object fields as Dictionary.

reportportal_client/_internal/services/client_id.py

@@ -57,6 +57,7 @@ def _read_client_id():
     config = __read_config()
     if config.has_option(__NoSectionConfigParser.DEFAULT_SECTION, CLIENT_ID_PROPERTY):
         return config.get(__NoSectionConfigParser.DEFAULT_SECTION, CLIENT_ID_PROPERTY)
+    return None
 
 
 def _store_client_id(client_id):

reportportal_client/_internal/services/statistics.py

@@ -73,7 +73,9 @@ def _get_payload(event_name: str, agent_name: Optional[str], agent_version: Opti
     return {"client_id": get_client_id(), "events": [{"name": event_name, "params": request_params}]}
 
 
-def send_event(event_name: str, agent_name: Optional[str], agent_version: Optional[str]) -> requests.Response:
+def send_event(
+    event_name: str, agent_name: Optional[str], agent_version: Optional[str]
+) -> Optional[requests.Response]:
     """Send an event to statistics service.
 
      Use client and agent versions with their names.
@@ -120,7 +122,7 @@ async def async_send_event(
             )
         except aiohttp.ClientError as exc:
             logger.debug("Failed to send data to Statistics service: connection error", exc)
-            return
+            return None
         if not result.ok:
             logger.debug(f"Failed to send data to Statistics service: {result.reason}")
         return result

reportportal_client/helpers/common_helpers.py

@@ -68,7 +68,7 @@
 class LifoQueue(Generic[_T]):
     """Primitive thread-safe Last-in-first-out queue implementation."""
 
-    _lock: threading.Lock()
+    _lock: threading.Lock
     __items: List[_T]
 
     def __init__(self):
@@ -98,9 +98,13 @@ def last(self) -> _T:
 
         :return: The last element in the queue.
         """
+        if len(self.__items) <= 0:
+            return None
+
         with self._lock:
             if len(self.__items) > 0:
                 return self.__items[-1]
+        return None
 
     def qsize(self):
         """Return the queue size."""
@@ -149,7 +153,7 @@ def dict_to_payload(dictionary: Optional[dict]) -> Optional[List[dict]]:
     hidden = my_dictionary.pop("system", None)
     result = []
     for key, value in sorted(my_dictionary.items()):
-        attribute = {"key": str(key), "value": str(value)}
+        attribute: Dict[str, Any] = {"key": str(key), "value": str(value)}
         if hidden is not None:
             attribute["system"] = hidden
         result.append(attribute)