Skip to content

Commit c8fc34b

Browse files
committed
small fixes
1 parent 218f99a commit c8fc34b

File tree

5 files changed

+6
-12
lines changed

5 files changed

+6
-12
lines changed

ydb/aio/credentials.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ def submit(self, callback):
5454
asyncio.ensure_future(self._wrapped_execution(callback))
5555

5656

57-
class AbstractExpiringTokenCredentials(
58-
credentials.AbstractExpiringTokenCredentials, abc.ABC
59-
):
57+
class AbstractExpiringTokenCredentials(credentials.AbstractExpiringTokenCredentials):
6058
def __init__(self):
6159
super(AbstractExpiringTokenCredentials, self).__init__()
6260
self._tp = _AtMostOneExecution()

ydb/aio/iam.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
aiohttp = None
2424

2525

26-
class TokenServiceCredentials(AbstractExpiringTokenCredentials, abc.ABC):
26+
class TokenServiceCredentials(AbstractExpiringTokenCredentials):
2727
def __init__(self, iam_endpoint=None, iam_channel_credentials=None):
2828
super(TokenServiceCredentials, self).__init__()
2929
assert (

ydb/credentials.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def cleanup(self):
8585
self._can_schedule = True
8686

8787

88-
class AbstractExpiringTokenCredentials(Credentials, abc.ABC):
88+
class AbstractExpiringTokenCredentials(Credentials):
8989
def __init__(self, tracer=None):
9090
super(AbstractExpiringTokenCredentials, self).__init__(tracer)
9191
self._expires_in = 0

ydb/iam/auth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def get_jwt(account_id, access_key_id, private_key, jwt_expiration_timeout):
4444
)
4545

4646

47-
class TokenServiceCredentials(credentials.AbstractExpiringTokenCredentials, abc.ABC):
47+
class TokenServiceCredentials(credentials.AbstractExpiringTokenCredentials):
4848
def __init__(self, iam_endpoint=None, iam_channel_credentials=None, tracer=None):
4949
super(TokenServiceCredentials, self).__init__(tracer)
5050
assert (

ydb/types.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
_SECONDS_IN_DAY = 60 * 60 * 24
1313
_EPOCH = datetime(1970, 1, 1)
1414

15-
_from_bytes = None
16-
1715

1816
def _from_date_number(x, table_client_settings):
1917
if (
@@ -39,8 +37,6 @@ def _from_json(x, table_client_settings):
3937
and table_client_settings._native_json_in_result_sets
4038
):
4139
return json.loads(x)
42-
if _from_bytes is not None:
43-
return _from_bytes(x, table_client_settings)
4440
return x
4541

4642

@@ -109,7 +105,7 @@ class PrimitiveType(enum.Enum):
109105
Float = _apis.primitive_types.FLOAT, "float_value"
110106

111107
String = _apis.primitive_types.STRING, "bytes_value"
112-
Utf8 = _apis.primitive_types.UTF8, "text_value", _from_bytes
108+
Utf8 = _apis.primitive_types.UTF8, "text_value"
113109

114110
Yson = _apis.primitive_types.YSON, "bytes_value"
115111
Json = _apis.primitive_types.JSON, "text_value", _from_json
@@ -138,7 +134,7 @@ class PrimitiveType(enum.Enum):
138134
_to_interval,
139135
)
140136

141-
DyNumber = _apis.primitive_types.DYNUMBER, "text_value", _from_bytes
137+
DyNumber = _apis.primitive_types.DYNUMBER, "text_value"
142138

143139
def __init__(self, idn, proto_field, to_obj=None, from_obj=None):
144140
self._idn_ = idn

0 commit comments

Comments
 (0)