style: support pyupgrade pre-commit hook (#129)

Co-authored-by: Islam Alibekov <[email protected]>

Author: opportunity356

.pre-commit-config.yaml

@@ -9,11 +9,17 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
-        exclude: '^yandex/.*\.py(i)?$'
+        exclude: '^yandex/.*$'  # excluding codgen files
 
   - repo: https://github.com/compilerla/conventional-pre-commit
     rev: "v3.6.0"
     hooks:
       - id: conventional-pre-commit
         stages: [commit-msg]
         args: []
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.19.0
+    hooks:
+    - id: pyupgrade
+      exclude: '^yandex/.*$'  # excluding codgen files

tests/grpc_server_mock.py

@@ -13,7 +13,7 @@
 DEFAULT_ZONE = zone_pb2.Zone()
 
 
-class ZoneServiceMock(object):
+class ZoneServiceMock:
     def __init__(self, handler):
         self.__handler = handler
 

yandexcloud/_auth_fabric.py

@@ -8,7 +8,6 @@
 import cryptography  # noqa: F401; pylint: disable=unused-import
 import jwt
 import requests
-import six
 
 from yandex.cloud.iam.v1.iam_token_service_pb2 import CreateIamTokenRequest
 
@@ -45,7 +44,7 @@ def __validate_service_account_key(sa_key: Optional[dict]) -> bool:
         raise RuntimeError("Invalid Service Account Key: missing private key.")
 
     private_key_prefix = "-----BEGIN PRIVATE KEY-----"
-    if not isinstance(private_key, six.string_types) or private_key_prefix not in private_key:
+    if not isinstance(private_key, str) or private_key_prefix not in private_key:
         error_message = (
             "Invalid Service Account Key: private key is in incorrect format."
             f"Should start with {private_key_prefix}.\n"

yandexcloud/_auth_plugin.py

@@ -1,8 +1,8 @@
 from datetime import datetime
 from typing import TYPE_CHECKING, Callable, Optional, Tuple, Union
+from urllib.parse import urlparse
 
 import grpc
-from six.moves.urllib.parse import urlparse
 
 from yandex.cloud.iam.v1.iam_token_service_pb2_grpc import IamTokenServiceStub
 

yandexcloud/_helpers.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from typing import TYPE_CHECKING, Optional
 
 from yandex.cloud.iam.v1.service_account_service_pb2 import ListServiceAccountsRequest

yandexcloud/_wrappers/dataproc/__init__.py

@@ -1,12 +1,10 @@
-# -*- coding: utf-8 -*-
 # pylint: disable=no-member
 # mypy: ignore-errors
 import logging
 import random
 from typing import Iterable, NamedTuple
 
 from google.protobuf.field_mask_pb2 import FieldMask
-from six import string_types
 
 import yandex.cloud.dataproc.v1.cluster_pb2 as cluster_pb
 import yandex.cloud.dataproc.v1.cluster_service_pb2 as cluster_service_pb
@@ -215,7 +213,7 @@ def create_cluster(
                 ssh_public_keys = (self.default_public_ssh_key,)
             else:
                 raise RuntimeError("Public ssh keys must be specified.")
-        elif isinstance(ssh_public_keys, string_types):
+        elif isinstance(ssh_public_keys, str):
             ssh_public_keys = [ssh_public_keys]
 
         gib = 1024**3

yandexcloud/operations.py

@@ -25,6 +25,6 @@ def __init__(
 
 class OperationError(RuntimeError):
     def __init__(self, message: str, operation_result: OperationResult[ResponseType, MetaType]):
-        super(OperationError, self).__init__(message)  # pylint: disable=super-with-arguments
+        super().__init__(message)  # pylint: disable=super-with-arguments
         self.message = message
         self.operation_result = operation_result