Bump black and fix lint

elasticsearch/_async/helpers.py

@@ -62,7 +62,7 @@ async def _process_bulk_chunk(
     raise_on_error=True,
     ignore_status=(),
     *args,
-    **kwargs
+    **kwargs,
 ):
     """
     Send a bulk request to elasticsearch and process the output.
@@ -132,9 +132,8 @@ async def async_streaming_bulk(
     yield_ok=True,
     ignore_status=(),
     *args,
-    **kwargs
+    **kwargs,
 ):
-
     """
     Streaming bulk consumes actions from the iterable passed in and yields
     results per action. For non-streaming usecases use
@@ -176,7 +175,6 @@ async def map_actions():
     async for bulk_data, bulk_actions in _chunk_actions(
         map_actions(), chunk_size, max_chunk_bytes, client.transport.serializer
     ):
-
         for attempt in range(max_retries + 1):
             to_retry, to_retry_data = [], []
             if attempt:
@@ -198,7 +196,6 @@ async def map_actions():
                         **kwargs,
                     ),
                 ):
-
                     if not ok:
                         action, info = info.popitem()
                         # retry if retries enabled, we get 429, and we are not
@@ -292,7 +289,7 @@ async def async_scan(
     request_timeout=None,
     clear_scroll=True,
     scroll_kwargs=None,
-    **kwargs
+    **kwargs,
 ):
     """
     Simple abstraction on top of the
@@ -430,7 +427,6 @@ async def async_reindex(
     scan_kwargs={},
     bulk_kwargs={},
 ):
-
     """
     Reindex all documents from one index that satisfy a given query
     to another, potentially (if `target_client` is specified) on a different cluster.

elasticsearch/_async/helpers.pyi

@@ -50,7 +50,7 @@ def _process_bulk_chunk(
     raise_on_error: bool = ...,
     ignore_status: Optional[Union[int, Collection[int]]] = ...,
     *args: Any,
-    **kwargs: Any
+    **kwargs: Any,
 ) -> AsyncGenerator[Tuple[bool, Any], None]: ...
 def aiter(x: Union[Iterable[T], AsyncIterable[T]]) -> AsyncGenerator[T, None]: ...
 def azip(
@@ -70,15 +70,15 @@ def async_streaming_bulk(
     yield_ok: bool = ...,
     ignore_status: Optional[Union[int, Collection[int]]] = ...,
     *args: Any,
-    **kwargs: Any
+    **kwargs: Any,
 ) -> AsyncGenerator[Tuple[bool, Any], None]: ...
 async def async_bulk(
     client: AsyncElasticsearch,
     actions: Union[Iterable[Any], AsyncIterable[Any]],
     stats_only: bool = ...,
     ignore_status: Optional[Union[int, Collection[int]]] = ...,
     *args: Any,
-    **kwargs: Any
+    **kwargs: Any,
 ) -> Tuple[int, Union[int, List[Any]]]: ...
 def async_scan(
     client: AsyncElasticsearch,
@@ -90,7 +90,7 @@ def async_scan(
     request_timeout: Optional[Union[float, int]] = ...,
     clear_scroll: bool = ...,
     scroll_kwargs: Optional[Mapping[str, Any]] = ...,
-    **kwargs: Any
+    **kwargs: Any,
 ) -> AsyncGenerator[int, None]: ...
 async def async_reindex(
     client: AsyncElasticsearch,

elasticsearch/_async/http_aiohttp.py

@@ -80,7 +80,6 @@ async def close(self):
 
 
 class AIOHttpConnection(AsyncConnection):
-
     HTTP_CLIENT_META = ("ai", _client_meta_version(aiohttp.__version__))
 
     def __init__(

elasticsearch/_async/transport.py

@@ -67,7 +67,7 @@ def __init__(
         retry_on_timeout=False,
         send_get_body_as="GET",
         meta_header=True,
-        **kwargs
+        **kwargs,
     ):
         """
         :arg hosts: list of dictionaries, each containing keyword arguments to
@@ -166,7 +166,6 @@ async def _async_init(self):
 
         # ... and we can start sniffing in the background.
         if self.sniffing_task is None and self.sniff_on_start:
-
             # Create an asyncio.Event for future calls to block on
             # until the initial sniffing task completes.
             self._sniff_on_start_event = asyncio.Event()
@@ -467,7 +466,6 @@ async def _do_verify_elasticsearch(self, headers, timeout):
         # Ensure that there's only one async exec within this section
         # at a time to not emit unnecessary index API calls.
         async with self._verify_elasticsearch_lock:
-
             # Product check has already been completed while we were
             # waiting our turn, no need to do again.
             if self._verified_elasticsearch is not None:

elasticsearch/_async/transport.pyi

@@ -64,7 +64,7 @@ class AsyncTransport(object):
         retry_on_timeout: bool = ...,
         send_get_body_as: str = ...,
         meta_header: bool = ...,
-        **kwargs: Any
+        **kwargs: Any,
     ) -> None: ...
     def add_connection(self, host: Any) -> None: ...
     def set_connections(self, hosts: Collection[Any]) -> None: ...

elasticsearch/client/utils.pyi

@@ -52,7 +52,7 @@ def query_params(
     response_mimetypes: Optional[List[str]] = ...,
     body_params: Optional[List[str]] = ...,
     body_name: Optional[str] = ...,
-    body_required: Optional[bool] = ...
+    body_required: Optional[bool] = ...,
 ) -> Callable[[Callable[..., T]], Callable[..., T]]: ...
 def _bulk_body(
     serializer: Serializer, body: Union[str, bytes, Mapping[str, Any], Iterable[Any]]

elasticsearch/compat.py

@@ -15,52 +15,65 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-import asyncio
+import inspect
+import sys
+from pathlib import Path
+from typing import Tuple, Type, Union
 
-string_types = str, bytes
-from urllib.parse import quote, quote_plus, unquote, urlencode, urlparse
+string_types: Tuple[Type[str], Type[bytes]] = (str, bytes)
 
-map = map
-from queue import Queue
 
-
-def to_str(x, encoding="ascii"):
+def to_str(x: Union[str, bytes], encoding: str = "ascii") -> str:
     if not isinstance(x, str):
         return x.decode(encoding)
     return x
 
 
-def to_bytes(x, encoding="ascii"):
+def to_bytes(x: Union[str, bytes], encoding: str = "ascii") -> bytes:
     if not isinstance(x, bytes):
         return x.encode(encoding)
     return x
 
 
-from collections.abc import Mapping
-
-reraise_exceptions = (RecursionError, asyncio.CancelledError)
+def warn_stacklevel() -> int:
+    """Dynamically determine warning stacklevel for warnings based on the call stack"""
+    try:
+        # Grab the root module from the current module '__name__'
+        module_name = __name__.partition(".")[0]
+        module_path = Path(sys.modules[module_name].__file__)  # type: ignore[arg-type]
 
-try:
-    from threading import Lock
-except ImportError:  # Python <3.7 isn't guaranteed to have threading support.
+        # If the module is a folder we're looking at
+        # subdirectories, otherwise we're looking for
+        # an exact match.
+        module_is_folder = module_path.name == "__init__.py"
+        if module_is_folder:
+            module_path = module_path.parent
 
-    class Lock:
-        def __enter__(self):
-            pass
+        # Look through frames until we find a file that
+        # isn't a part of our module, then return that stacklevel.
+        for level, frame in enumerate(inspect.stack()):
+            # Garbage collecting frames
+            frame_filename = Path(frame.filename)
+            del frame
 
-        def __exit__(self, *_):
-            pass
+            if (
+                # If the module is a folder we look at subdirectory
+                module_is_folder
+                and module_path not in frame_filename.parents
+            ) or (
+                # Otherwise we're looking for an exact match.
+                not module_is_folder
+                and module_path != frame_filename
+            ):
+                return level
+    except KeyError:
+        pass
+    return 0
 
 
 __all__ = [
     "string_types",
-    "reraise_exceptions",
-    "quote_plus",
-    "quote",
-    "urlencode",
-    "unquote",
-    "urlparse",
-    "map",
-    "Queue",
-    "Mapping",
+    "to_str",
+    "to_bytes",
+    "warn_stacklevel",
 ]

elasticsearch/connection/base.py

@@ -82,9 +82,8 @@ def __init__(
         api_key=None,
         opaque_id=None,
         meta_header=True,
-        **kwargs
+        **kwargs,
     ):
-
         if cloud_id:
             try:
                 _, cloud_id = cloud_id.split(":")

elasticsearch/connection/base.pyi

@@ -57,7 +57,7 @@ class Connection(object):
         api_key: Optional[Union[Tuple[str, str], List[str], str]] = ...,
         opaque_id: Optional[str] = ...,
         meta_header: bool = ...,
-        **kwargs: Any
+        **kwargs: Any,
     ) -> None: ...
     def __repr__(self) -> str: ...
     def __eq__(self, other: object) -> bool: ...

elasticsearch/connection/http_requests.py

@@ -80,7 +80,7 @@ def __init__(
         cloud_id=None,
         api_key=None,
         opaque_id=None,
-        **kwargs
+        **kwargs,
     ):
         if not REQUESTS_AVAILABLE:
             raise ImproperlyConfigured(
@@ -101,7 +101,7 @@ def __init__(
             cloud_id=cloud_id,
             api_key=api_key,
             opaque_id=opaque_id,
-            **kwargs
+            **kwargs,
         )
 
         if not self.http_compress:

elasticsearch/connection/http_requests.pyi

@@ -40,5 +40,5 @@ class RequestsHttpConnection(Connection):
         api_key: Optional[Any] = ...,
         opaque_id: Optional[str] = ...,
         meta_header: bool = ...,
-        **kwargs: Any
+        **kwargs: Any,
     ) -> None: ...

elasticsearch/connection/http_urllib3.py

@@ -122,7 +122,7 @@ def __init__(
         cloud_id=None,
         api_key=None,
         opaque_id=None,
-        **kwargs
+        **kwargs,
     ):
         # Initialize headers before calling super().__init__().
         self.headers = urllib3.make_headers(keep_alive=True)
@@ -136,7 +136,7 @@ def __init__(
             cloud_id=cloud_id,
             api_key=api_key,
             opaque_id=opaque_id,
-            **kwargs
+            **kwargs,
         )
         if http_auth is not None:
             if isinstance(http_auth, (tuple, list)):

elasticsearch/connection/http_urllib3.pyi

@@ -54,5 +54,5 @@ class Urllib3HttpConnection(Connection):
         api_key: Optional[Any] = ...,
         opaque_id: Optional[str] = ...,
         meta_header: bool = ...,
-        **kwargs: Any
+        **kwargs: Any,
     ) -> None: ...

elasticsearch/connection_pool.py

@@ -118,7 +118,7 @@ def __init__(
         timeout_cutoff=5,
         selector_class=RoundRobinSelector,
         randomize_hosts=True,
-        **kwargs
+        **kwargs,
     ):
         """
         :arg connections: list of tuples containing the

elasticsearch/connection_pool.pyi

@@ -51,7 +51,7 @@ class ConnectionPool(object):
         timeout_cutoff: int = ...,
         selector_class: Type[ConnectionSelector] = ...,
         randomize_hosts: bool = ...,
-        **kwargs: Any
+        **kwargs: Any,
     ) -> None: ...
     def mark_dead(self, connection: Connection, now: Optional[float] = ...) -> None: ...
     def mark_live(self, connection: Connection) -> None: ...

elasticsearch/helpers/__init__.py

@@ -15,8 +15,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-import sys
-
 from .._async.helpers import async_bulk, async_reindex, async_scan, async_streaming_bulk
 from .actions import (
     _chunk_actions,