Skip to content

Commit bfee7fa

Browse files
AsafMahAsafMah
committed
Final lints
1 parent ac17eb2 commit bfee7fa

File tree

14 files changed

+81
-73
lines changed

14 files changed

+81
-73
lines changed

‎azure-kusto-data/azure/kusto/data/aio/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
from .client import KustoClient
2+
3+
__all__ = [
4+
"KustoClient",
5+
]

‎azure-kusto-data/azure/kusto/data/aio/response.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ async def __anext__(self) -> BaseKustoResultTable:
3030
if self.finished:
3131
raise StopAsyncIteration()
3232

33-
if type(self._current_table) == KustoStreamingResultTable and not self._current_table.finished and not self._skip_incomplete_tables:
33+
if isinstance(self._current_table, KustoStreamingResultTable) and not self._current_table.finished and not self._skip_incomplete_tables:
3434
raise KustoStreamingQueryError(
3535
"Tried retrieving a new primary_result table before the old one was finished. To override call `set_skip_incomplete_tables(True)`"
3636
)
@@ -89,5 +89,5 @@ def __aiter__(self) -> AsyncIterator[KustoStreamingResultTable]:
8989
async def __anext__(self) -> KustoStreamingResultTable:
9090
while True:
9191
table = await self.dataset.__anext__()
92-
if type(table) is KustoStreamingResultTable:
92+
if isinstance(table, KustoStreamingResultTable):
9393
return table

‎azure-kusto-data/azure/kusto/data/response.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,5 +232,5 @@ def __iter__(self) -> Iterator[KustoStreamingResultTable]:
232232
def __next__(self) -> KustoStreamingResultTable:
233233
while True:
234234
table = next(self.dataset)
235-
if type(table) is KustoStreamingResultTable:
235+
if isinstance(table, KustoStreamingResultTable):
236236
return table

‎azure-kusto-data/tests/aio/test_async_token_providers.py‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,28 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License
3+
import asyncio
4+
35
import pytest
6+
from _cloud_settings import CloudSettings, CloudInfo
7+
from _token_providers import (
8+
DeviceLoginTokenProvider,
9+
AsyncDefaultAzureCredential,
10+
AzureIdentityTokenCredentialProvider,
11+
CallbackTokenProvider,
12+
ApplicationCertificateTokenProvider,
13+
ApplicationKeyTokenProvider,
14+
UserPassTokenProvider,
15+
AzCliTokenProvider,
16+
MsiTokenProvider,
17+
BasicTokenProvider,
18+
TokenConstants,
19+
)
420
from azure.identity.aio import ClientSecretCredential as AsyncClientSecretCredential
521

622
from azure.kusto.data._decorators import aio_documented_by
7-
from azure.kusto.data._token_providers import *
823
from azure.kusto.data.env_utils import get_env, get_app_id, get_auth_id, prepare_app_key_auth
24+
from exceptions import KustoClientError, KustoAsyncUsageError
25+
926
from .test_kusto_client import run_aio_tests
1027
from ..test_token_providers import KUSTO_URI, TOKEN_VALUE, TEST_AZ_AUTH, TEST_MSI_AUTH, TEST_DEVICE_AUTH, TokenProviderTests, MockProvider
1128

‎azure-kusto-data/tests/aio/test_kusto_client.py‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"""Tests for KustoClient."""
22

33
import json
4-
import sys
54
from unittest.mock import patch
65

76
import pytest
@@ -13,28 +12,10 @@
1312
from azure.kusto.data.helpers import dataframe_from_result_table
1413
from ..kusto_client_common import KustoClientTestsMixin, mocked_requests_post
1514
from ..test_kusto_client import TestKustoClient as KustoClientTestsSync
15+
from azure.kusto.data.aio.client import KustoClient
16+
from aioresponses import aioresponses, CallbackResult
1617

17-
PANDAS = False
18-
try:
1918

20-
PANDAS = True
21-
except:
22-
pass
23-
24-
run_aio_tests = False
25-
try:
26-
from azure.kusto.data.aio.client import KustoClient
27-
from aioresponses import aioresponses, CallbackResult
28-
29-
run_aio_tests = True
30-
except:
31-
pass
32-
33-
if sys.version_info < (3, 6):
34-
run_aio_tests = False
35-
36-
37-
@pytest.mark.skipif(not run_aio_tests, reason="requires aio")
3819
@aio_documented_by(KustoClientTestsSync)
3920
class TestKustoClient(KustoClientTestsMixin):
4021
@staticmethod
@@ -91,7 +72,6 @@ async def test_sanity_control_command(self):
9172
response = await client.execute_mgmt("NetDefaultDB", ".show version")
9273
self._assert_sanity_control_command_response(response)
9374

94-
@pytest.mark.skipif(not PANDAS, reason="requires pandas")
9575
@aio_documented_by(KustoClientTestsSync.test_sanity_data_frame)
9676
@pytest.mark.asyncio
9777
async def test_sanity_data_frame(self):

‎azure-kusto-data/tests/conftest.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
from typing import Tuple
2+
3+
import pytest
4+
from azure.kusto.data import KustoConnectionStringBuilder
5+
from kusto_client_common import KustoClientTestsMixin
6+
7+
18
@pytest.fixture(
29
params=[
310
"user_password",

‎azure-kusto-data/tests/kusto_client_common.py‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,8 @@
1313
from azure.kusto.data._models import KustoResultRow, KustoResultTable, KustoStreamingResultTable
1414
from azure.kusto.data.response import WellKnownDataSet, KustoStreamingResponseDataSet, KustoResponseDataSet
1515

16-
PANDAS = False
17-
try:
18-
import pandas
19-
20-
PANDAS = True
21-
except:
22-
pass
16+
from pandas import DataFrame, Series, to_datetime
17+
from pandas.testing import assert_frame_equal
2318

2419

2520
def mocked_requests_post(*args, **kwargs):
@@ -275,10 +270,7 @@ def _assert_sanity_control_command_response(response: SyncResponseSet):
275270
assert result["ServiceType"] == "Engine"
276271
assert result["ProductVersion"] == "KustoMain_2018.04.29.5"
277272

278-
def _assert_sanity_data_frame_response(self, data_frame: "pandas.DataFrame"):
279-
from pandas import DataFrame, Series
280-
from pandas.testing import assert_frame_equal
281-
273+
def _assert_sanity_data_frame_response(self, data_frame: "DataFrame"):
282274
assert len(data_frame.columns) == 19
283275
expected_dict = {
284276
"rownumber": Series([None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9], dtype="Int32"),
@@ -310,17 +302,17 @@ def _assert_sanity_data_frame_response(self, data_frame: "pandas.DataFrame"):
310302
"xuint64": Series([None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9], dtype="Int64"),
311303
"xdate": Series(
312304
[
313-
pandas.to_datetime(None),
314-
pandas.to_datetime("2014-01-01T01:01:01.0000000Z"),
315-
pandas.to_datetime("2015-01-01T01:01:01.0000001Z"),
316-
pandas.to_datetime("2016-01-01T01:01:01.0000002Z"),
317-
pandas.to_datetime("2017-01-01T01:01:01.0000003Z"),
318-
pandas.to_datetime("2018-01-01T01:01:01.0000004Z"),
319-
pandas.to_datetime("2019-01-01T01:01:01.0000005Z"),
320-
pandas.to_datetime("2020-01-01T01:01:01.0000006Z"),
321-
pandas.to_datetime("2021-01-01T01:01:01.0000007Z"),
322-
pandas.to_datetime("2022-01-01T01:01:01.0000008Z"),
323-
pandas.to_datetime("2023-01-01T01:01:01.0000009Z"),
305+
to_datetime(None),
306+
to_datetime("2014-01-01T01:01:01.0000000Z"),
307+
to_datetime("2015-01-01T01:01:01.0000001Z"),
308+
to_datetime("2016-01-01T01:01:01.0000002Z"),
309+
to_datetime("2017-01-01T01:01:01.0000003Z"),
310+
to_datetime("2018-01-01T01:01:01.0000004Z"),
311+
to_datetime("2019-01-01T01:01:01.0000005Z"),
312+
to_datetime("2020-01-01T01:01:01.0000006Z"),
313+
to_datetime("2021-01-01T01:01:01.0000007Z"),
314+
to_datetime("2022-01-01T01:01:01.0000008Z"),
315+
to_datetime("2023-01-01T01:01:01.0000009Z"),
324316
]
325317
),
326318
"xsmalltext": Series(["", "Zero", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine"], dtype=object),
@@ -390,7 +382,7 @@ def _assert_partial_results_response(response: SyncResponseSet):
390382
assert len(results) == 5
391383
assert results[0]["x"] == 1
392384

393-
if type(response) == KustoStreamingResponseDataSet:
385+
if isinstance(response, KustoStreamingResponseDataSet):
394386
_ = [t for t in response] # Read rest of tables
395387
assert response.errors_count == 1
396388
assert "E_QUERY_RESULT_SET_TOO_LARGE" in response.get_exceptions()[0]

‎azure-kusto-data/tests/test_e2e_data.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,13 @@ def get_client(cls, app_insights=False) -> KustoClient:
177177
def normalize_row(row):
178178
result = []
179179
for r in row:
180-
if type(r) == bool:
180+
if isinstance(r, bool):
181181
result.append(str(r).lower())
182-
elif type(r) == datetime:
182+
elif isinstance(r, datetime):
183183
result.append(r.strftime("%Y-%m-%dT%H:%M:%SZ"))
184-
elif type(r) == float:
184+
elif isinstance(r, float):
185185
result.append(r)
186-
elif type(r) == dict:
186+
elif isinstance(r, dict):
187187
result.append(json.dumps(r).replace(" ", ""))
188188
else:
189189
result.append(str(r))
@@ -202,7 +202,7 @@ def test_streaming_query(self):
202202
for expected_row in self.test_streaming_data:
203203
actual_row = self.normalize_row(next(primary).to_list())
204204
for i in range(len(expected_row)):
205-
if type(actual_row[i]) == float:
205+
if isinstance(actual_row[i], float):
206206
assert pytest.approx(float(expected_row[i]), 0.1) == actual_row[i]
207207
else:
208208
assert expected_row[i] == actual_row[i]
@@ -230,7 +230,7 @@ async def test_streaming_query_async(self):
230230

231231
actual_row = self.normalize_row(row.to_list())
232232
for i in range(len(expected_row)):
233-
if type(actual_row[i]) == float:
233+
if isinstance(actual_row[i], float):
234234
assert pytest.approx(float(expected_row[i]), 0.1) == actual_row[i]
235235
else:
236236
assert expected_row[i] == actual_row[i]
@@ -254,15 +254,15 @@ def test_streaming_query_internal(self):
254254
query_props = next(frames)
255255
assert query_props["FrameType"] == FrameType.DataTable
256256
assert query_props["TableKind"] == WellKnownDataSet.QueryProperties.value
257-
assert type(query_props["Columns"]) == list
258-
assert type(query_props["Rows"]) == list
257+
assert isinstance(query_props["Columns"], list)
258+
assert isinstance(query_props["Rows"], list)
259259
assert len(query_props["Rows"][0]) == len(query_props["Columns"])
260260

261261
primary_result = next(frames)
262262
assert primary_result["FrameType"] == FrameType.DataTable
263263
assert primary_result["TableKind"] == WellKnownDataSet.PrimaryResult.value
264-
assert type(primary_result["Columns"]) == list
265-
assert type(primary_result["Rows"]) != list
264+
assert isinstance(primary_result["Columns"], list)
265+
assert not isinstance(primary_result["Rows"], list)
266266

267267
row = next(primary_result["Rows"])
268268
assert len(row) == len(primary_result["Columns"])
@@ -282,15 +282,15 @@ async def test_streaming_query_internal_async(self):
282282
query_props = await frames.__anext__()
283283
assert query_props["FrameType"] == FrameType.DataTable
284284
assert query_props["TableKind"] == WellKnownDataSet.QueryProperties.value
285-
assert type(query_props["Columns"]) == list
286-
assert type(query_props["Rows"]) == list
285+
assert isinstance(query_props["Columns"], list)
286+
assert isinstance(query_props["Rows"], list)
287287
assert len(query_props["Rows"][0]) == len(query_props["Columns"])
288288

289289
primary_result = await frames.__anext__()
290290
assert primary_result["FrameType"] == FrameType.DataTable
291291
assert primary_result["TableKind"] == WellKnownDataSet.PrimaryResult.value
292-
assert type(primary_result["Columns"]) == list
293-
assert type(primary_result["Rows"]) != list
292+
assert isinstance(primary_result["Columns"], list)
293+
assert not isinstance(primary_result["Rows"], list)
294294

295295
row = await primary_result["Rows"].__anext__()
296296
assert len(row) == len(primary_result["Columns"])

‎azure-kusto-data/tests/test_kusto_client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def test_partial_results(self, mock_post, method):
9999
properties.set_option(ClientRequestProperties.results_defer_partial_query_failures_option_name, False)
100100
with pytest.raises(KustoMultiApiError) as e:
101101
response = method.__call__(client, "PythonTest", query, properties=properties)
102-
if type(response) == KustoStreamingResponseDataSet:
102+
if isinstance(response, KustoStreamingResponseDataSet):
103103
list(get_response_first_primary_result(response))
104104
errors = e.value.get_api_errors()
105105
assert len(errors) == 1

‎azure-kusto-data/tests/test_security.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License
33
import pytest
4+
from _cloud_settings import CloudSettings
5+
from _token_providers import CallbackTokenProvider, MsiTokenProvider, UserPassTokenProvider
46

57
from azure.kusto.data import KustoConnectionStringBuilder
6-
from azure.kusto.data._token_providers import *
78
from azure.kusto.data.exceptions import KustoAuthenticationError
89
from azure.kusto.data.security import _AadHelper
910

0 commit comments

Comments
 (0)