Merge pull request #182 remove six

Author: rekby

CHANGELOG.md

@@ -1,3 +1,4 @@
+* Remove six package from code and dependencies (remove support python2)
 * Use anonymous credentials by default instead of iam metadata (use ydb.driver.credentials_from_env_variables for creds by env var)
 * Close grpc streams while closing readers/writers
 * Add control plane operations for topic api: create, drop

examples/reservations-bot-demo/cloud_function/requirements.txt

@@ -11,7 +11,6 @@ pycparser==2.20
 pydantic==1.6.2
 PyJWT==2.4.0
 requests==2.24.0
-six==1.15.0
 urllib3==1.26.5
 yandexcloud==0.48.0
 ydb==0.0.41

kikimr/public/sdk/python/client/__init__.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 from ydb import *  # noqa
 import sys
-import six
 import warnings
 
 warnings.warn("module kikimr.public.sdk.python.client is deprecated. please use ydb instead")
 
 
-for name, module in six.iteritems(sys.modules.copy()):
+for name, module in sys.modules.copy().items():
     if not name.startswith("ydb"):
         continue
 

test-requirements.txt

@@ -32,7 +32,6 @@ pytest-docker-compose==3.2.1
 python-dotenv==0.18.0
 PyYAML==5.4.1
 requests==2.26.0
-six==1.16.0
 texttable==1.6.4
 toml==0.10.2
 typing-extensions==3.10.0.0

ydb/_sp_impl.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import collections
 from concurrent import futures
-from six.moves import queue
+import queue
 import time
 import threading
 from . import settings, issues, _utilities, tracing

ydb/_utilities.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-import six
 import codecs
 from concurrent import futures
 import functools
 import hashlib
 import collections
+import urllib.parse
 from . import ydb_version
 
 try:
@@ -55,8 +55,8 @@ def parse_connection_string(connection_string):
         # default is grpcs
         cs = _grpcs_protocol + cs
 
-    p = six.moves.urllib.parse.urlparse(connection_string)
-    b = six.moves.urllib.parse.parse_qs(p.query)
+    p = urllib.parse.urlparse(connection_string)
+    b = urllib.parse.parse_qs(p.query)
     database = b.get("database", [])
     assert len(database) > 0
 
@@ -77,11 +77,9 @@ def decorator(*args, **kwargs):
 
 def get_query_hash(yql_text):
     try:
-        return hashlib.sha256(
-            six.text_type(yql_text, "utf-8").encode("utf-8")
-        ).hexdigest()
+        return hashlib.sha256(str(yql_text, "utf-8").encode("utf-8")).hexdigest()
     except TypeError:
-        return hashlib.sha256(six.text_type(yql_text).encode("utf-8")).hexdigest()
+        return hashlib.sha256(str(yql_text).encode("utf-8")).hexdigest()
 
 
 class LRUCache(object):

ydb/aio/credentials.py

@@ -3,7 +3,6 @@
 import abc
 import asyncio
 import logging
-import six
 from ydb import issues, credentials
 
 logger = logging.getLogger(__name__)
@@ -55,7 +54,6 @@ def submit(self, callback):
             asyncio.ensure_future(self._wrapped_execution(callback))
 
 
-@six.add_metaclass(abc.ABCMeta)
 class AbstractExpiringTokenCredentials(credentials.AbstractExpiringTokenCredentials):
     def __init__(self):
         super(AbstractExpiringTokenCredentials, self).__init__()

ydb/aio/iam.py

@@ -3,7 +3,6 @@
 
 import abc
 import logging
-import six
 from ydb.iam import auth
 from .credentials import AbstractExpiringTokenCredentials
 
@@ -24,7 +23,6 @@
     aiohttp = None
 
 
-@six.add_metaclass(abc.ABCMeta)
 class TokenServiceCredentials(AbstractExpiringTokenCredentials):
     def __init__(self, iam_endpoint=None, iam_channel_credentials=None):
         super(TokenServiceCredentials, self).__init__()

ydb/convert.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import decimal
 from google.protobuf import struct_pb2
-import six
 
 from . import issues, types, _apis
 
@@ -81,9 +80,7 @@ def _pb_to_list(type_pb, value_pb, table_client_settings):
 def _pb_to_tuple(type_pb, value_pb, table_client_settings):
     return tuple(
         _to_native_value(item_type, item_value, table_client_settings)
-        for item_type, item_value in six.moves.zip(
-            type_pb.tuple_type.elements, value_pb.items
-        )
+        for item_type, item_value in zip(type_pb.tuple_type.elements, value_pb.items)
     )
 
 
@@ -106,7 +103,7 @@ class _Struct(_DotDict):
 
 def _pb_to_struct(type_pb, value_pb, table_client_settings):
     result = _Struct()
-    for member, item in six.moves.zip(type_pb.struct_type.members, value_pb.items):
+    for member, item in zip(type_pb.struct_type.members, value_pb.items):
         result[member.name] = _to_native_value(member.type, item, table_client_settings)
     return result
 
@@ -201,9 +198,7 @@ def _list_to_pb(type_pb, value):
 
 def _tuple_to_pb(type_pb, value):
     value_pb = _apis.ydb_value.Value()
-    for element_type, element_value in six.moves.zip(
-        type_pb.tuple_type.elements, value
-    ):
+    for element_type, element_value in zip(type_pb.tuple_type.elements, value):
         value_item_proto = value_pb.items.add()
         value_item_proto.MergeFrom(_from_native_value(element_type, element_value))
     return value_pb
@@ -289,7 +284,7 @@ def parameters_to_pb(parameters_types, parameters_values):
         return {}
 
     param_values_pb = {}
-    for name, type_pb in six.iteritems(parameters_types):
+    for name, type_pb in parameters_types.items():
         result = _apis.ydb_value.TypedValue()
         ttype = type_pb
         if isinstance(type_pb, types.AbstractTypeBuilder):
@@ -330,7 +325,7 @@ def from_message(cls, message, table_client_settings=None):
 
         for row_proto in message.rows:
             row = _Row(message.columns)
-            for column, value, column_info in six.moves.zip(
+            for column, value, column_info in zip(
                 message.columns, row_proto.items, column_parsers
             ):
                 v_type = value.WhichOneof("value")
@@ -398,9 +393,7 @@ def __init__(self, columns, proto_row, table_client_settings, parsers):
         super(_LazyRow, self).__init__()
         self._columns = columns
         self._table_client_settings = table_client_settings
-        for i, (column, row_item) in enumerate(
-            six.moves.zip(self._columns, proto_row.items)
-        ):
+        for i, (column, row_item) in enumerate(zip(self._columns, proto_row.items)):
             super(_LazyRow, self).__setitem__(
                 column.name,
                 _LazyRowItem(row_item, column.type, table_client_settings, parsers[i]),

ydb/credentials.py

@@ -2,7 +2,6 @@
 import abc
 import typing
 
-import six
 from . import tracing, issues, connection
 from . import settings as settings_impl
 import threading
@@ -23,15 +22,13 @@
 logger = logging.getLogger(__name__)
 
 
-@six.add_metaclass(abc.ABCMeta)
-class AbstractCredentials(object):
+class AbstractCredentials(abc.ABC):
     """
     An abstract class that provides auth metadata
     """
 
 
-@six.add_metaclass(abc.ABCMeta)
-class Credentials(object):
+class Credentials(abc.ABC):
     def __init__(self, tracer=None):
         self.tracer = tracer if tracer is not None else tracing.Tracer(None)
 
@@ -88,7 +85,6 @@ def cleanup(self):
             self._can_schedule = True
 
 
-@six.add_metaclass(abc.ABCMeta)
 class AbstractExpiringTokenCredentials(Credentials):
     def __init__(self, tracer=None):
         super(AbstractExpiringTokenCredentials, self).__init__(tracer)

ydb/dbapi/cursor.py

@@ -5,8 +5,6 @@
 import itertools
 import logging
 
-import six
-
 import ydb
 from .errors import DatabaseError
 
@@ -42,7 +40,7 @@ def render_datetime(value):
 def render(value):
     if value is None:
         return "NULL"
-    if isinstance(value, six.string_types):
+    if isinstance(value, str):
         return render_str(value)
     if isinstance(value, datetime.datetime):
         return render_datetime(value)

ydb/default_pem.py

@@ -1,6 +1,3 @@
-import six
-
-
 data = """
 # Issuer: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
 # Subject: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
@@ -4686,6 +4683,4 @@
 def load_default_pem():
     global data
 
-    if six.PY3:
-        return data.encode("utf-8")
-    return data
+    return data.encode("utf-8")

ydb/driver.py

@@ -1,15 +1,11 @@
 # -*- coding: utf-8 -*-
 from . import credentials as credentials_impl, table, scheme, pool
 from . import tracing
-import six
 import os
 import grpc
 from . import _utilities
 
-if six.PY2:
-    Any = None
-else:
-    from typing import Any  # noqa
+from typing import Any  # noqa
 
 
 class RPCCompression:

ydb/iam/auth.py

@@ -3,7 +3,6 @@
 import grpc
 import time
 import abc
-import six
 from datetime import datetime
 import json
 import os
@@ -45,7 +44,6 @@ def get_jwt(account_id, access_key_id, private_key, jwt_expiration_timeout):
     )
 
 
-@six.add_metaclass(abc.ABCMeta)
 class TokenServiceCredentials(credentials.AbstractExpiringTokenCredentials):
     def __init__(self, iam_endpoint=None, iam_channel_credentials=None, tracer=None):
         super(TokenServiceCredentials, self).__init__(tracer)
@@ -84,8 +82,7 @@ def _make_token_request(self):
             return {"access_token": response.iam_token, "expires_in": expires_in}
 
 
-@six.add_metaclass(abc.ABCMeta)
-class BaseJWTCredentials(object):
+class BaseJWTCredentials(abc.ABC):
     def __init__(self, account_id, access_key_id, private_key):
         self._account_id = account_id
         self._jwt_expiration_timeout = 60.0 * 60

ydb/issues.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from google.protobuf import text_format
 import enum
-from six.moves import queue
+import queue
 
 from . import _apis
 

ydb/pool.py

@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
+import abc
 import threading
 import logging
 from concurrent import futures
 import collections
 import random
 
-import six
-
 from . import connection as connection_impl, issues, resolver, _utilities, tracing
-from abc import abstractmethod, ABCMeta
+from abc import abstractmethod
 
 from .connection import Connection
 
@@ -296,8 +295,7 @@ def run(self):
         self.logger.info("Successfully terminated discovery process")
 
 
-@six.add_metaclass(ABCMeta)
-class IConnectionPool:
+class IConnectionPool(abc.ABC):
     @abstractmethod
     def __init__(self, driver_config):
         """

ydb/scheme.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import abc
 import enum
-import six
 from abc import abstractmethod
 from . import issues, operation, settings as settings_impl, _apis
 
@@ -347,8 +346,7 @@ def _wrap_describe_path_response(rpc_state, response):
     return _wrap_scheme_entry(message.self)
 
 
-@six.add_metaclass(abc.ABCMeta)
-class ISchemeClient:
+class ISchemeClient(abc.ABC):
     @abstractmethod
     def __init__(self, driver):
         pass