Skip to content

Commit b72f955

Browse files
committed
Fix some warnings
1 parent 2200b19 commit b72f955

2 files changed

Lines changed: 28 additions & 25 deletions

File tree

reportportal_client/aio/client.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ async def session(self) -> RetryingClientSession:
187187
else:
188188
ssl_config = ssl.create_default_context(ssl.Purpose.SERVER_AUTH, cafile=certifi.where())
189189

190-
connection_params = {"ssl": ssl_config, "limit": self.max_pool_size}
190+
connection_params: Dict[str, Any] = {"ssl": ssl_config, "limit": self.max_pool_size}
191191
if self.keepalive_timeout:
192192
connection_params["keepalive_timeout"] = self.keepalive_timeout
193193
connector = aiohttp.TCPConnector(**connection_params)
@@ -196,7 +196,7 @@ async def session(self) -> RetryingClientSession:
196196
if self.api_key:
197197
headers["Authorization"] = f"Bearer {self.api_key}"
198198

199-
session_params = {"headers": headers, "connector": connector}
199+
session_params: Dict[str, Any] = {"headers": headers, "connector": connector}
200200

201201
if self.http_timeout:
202202
if type(self.http_timeout) is tuple:
@@ -565,14 +565,14 @@ async def log_batch(self, log_batch: Optional[List[AsyncRPRequestLog]]) -> Optio
565565
:param log_batch: A list of log message objects.
566566
:return: Completion message tuple of variable size (depending on request size).
567567
"""
568+
if not log_batch:
569+
return None
570+
568571
url = root_uri_join(self.base_url_v2, "log")
569-
if log_batch:
570-
response = await ErrorPrintingAsyncHttpRequest(
571-
(await self.session()).post, url=url, data=AsyncRPLogBatch(log_batch).payload, name="log"
572-
).make()
573-
if not response:
574-
return None
575-
return await response.messages
572+
response = await ErrorPrintingAsyncHttpRequest(
573+
(await self.session()).post, url=url, data=AsyncRPLogBatch(log_batch).payload, name="log"
574+
).make()
575+
return await response.messages if response else None
576576

577577
def clone(self) -> "Client":
578578
"""Clone the client object, set current Item ID as cloned item ID.
@@ -1010,6 +1010,7 @@ async def close(self) -> None:
10101010
await self.__client.close()
10111011

10121012

1013+
# noinspection PyAbstractClass
10131014
class _RPClient(RP, metaclass=AbstractBaseClass):
10141015
"""Base class for different synchronous to asynchronous client implementations."""
10151016

@@ -1454,7 +1455,7 @@ class ThreadedRPClient(_RPClient):
14541455

14551456
task_timeout: float
14561457
shutdown_timeout: float
1457-
_task_list: BackgroundTaskList[Task[_T]]
1458+
_task_list: BackgroundTaskList[Task[Any]]
14581459
_task_mutex: threading.RLock
14591460
_loop: Optional[asyncio.AbstractEventLoop]
14601461
_thread: Optional[threading.Thread]
@@ -1645,7 +1646,7 @@ class BatchedRPClient(_RPClient):
16451646
trigger_interval: float
16461647
_loop: asyncio.AbstractEventLoop
16471648
_task_mutex: threading.RLock
1648-
_task_list: TriggerTaskBatcher[Task[_T]]
1649+
_task_list: TriggerTaskBatcher[Task[Any]]
16491650
__last_run_time: float
16501651

16511652
def __init_task_list(

reportportal_client/client.py

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,13 @@ class OutputType(aenum.Enum):
6666

6767
def get_output(self) -> Optional[TextIO]:
6868
"""Return TextIO based on the current type."""
69-
if self == OutputType.STDOUT:
70-
return sys.stdout
7169
if self == OutputType.STDERR:
7270
return sys.stderr
71+
else:
72+
return sys.stdout
7373

7474

75+
# noinspection PyAbstractClass
7576
class RP(metaclass=AbstractBaseClass):
7677
"""Common interface for ReportPortal clients.
7778
@@ -804,18 +805,19 @@ def update_test_item(
804805
return response.message
805806

806807
def _log(self, batch: Optional[List[RPRequestLog]]) -> Optional[Tuple[str, ...]]:
807-
if batch:
808-
url = uri_join(self.base_url_v2, "log")
809-
response = ErrorPrintingHttpRequest(
810-
self.session.post,
811-
url,
812-
files=RPLogBatch(batch).payload,
813-
verify_ssl=self.verify_ssl,
814-
http_timeout=self.http_timeout,
815-
name="log",
816-
).make()
817-
if response:
818-
return response.messages
808+
if not batch:
809+
return None
810+
811+
url = uri_join(self.base_url_v2, "log")
812+
response = ErrorPrintingHttpRequest(
813+
self.session.post,
814+
url,
815+
files=RPLogBatch(batch).payload,
816+
verify_ssl=self.verify_ssl,
817+
http_timeout=self.http_timeout,
818+
name="log",
819+
).make()
820+
return response.messages if response else None
819821

820822
def log(
821823
self,

0 commit comments

Comments
 (0)