Skip to content

build: new httpcore backwards compatibility #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 24, 2023
Merged

build: new httpcore backwards compatibility #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6737dfa
build: new httpcore backwards compatibility
ptiurin May 24, 2023
d74765d
Merge branch 'main' into fix-httpcore-compatibility
ptiurin May 24, 2023
d387f70
Ignore mypy issue with new lib
ptiurin May 24, 2023
a373e0c
Merge branch 'main' into fix-httpcore-compatibility
ptiurin May 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/firebolt/async_db/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import socket
from json import JSONDecodeError
from types import TracebackType
from typing import Any, Dict, Iterable, List, Optional
from typing import Any, Dict, List, Optional

from httpcore.backends.auto import AutoBackend
from httpcore.backends.base import SOCKET_OPTION, AsyncNetworkStream
from httpcore.backends.base import AsyncNetworkStream
from httpx import AsyncHTTPTransport, HTTPStatusError, RequestError, Timeout

from firebolt.async_db.cursor import Cursor
Expand Down Expand Up @@ -134,16 +134,20 @@ class OverriddenHttpBackend(AutoBackend):
and `KEEPIDLE` settings.
"""

async def connect_tcp(
async def connect_tcp( # type: ignore [override]
self,
host: str,
port: int,
timeout: Optional[float] = None,
local_address: Optional[str] = None,
socket_options: Optional[Iterable[SOCKET_OPTION]] = None,
**kwargs: Any,
) -> AsyncNetworkStream:
stream = await super().connect_tcp(
host, port, timeout=timeout, local_address=local_address
stream = await super().connect_tcp( # type: ignore [call-arg]
host,
port,
timeout=timeout,
local_address=local_address,
**kwargs,
)
# Enable keepalive
stream.get_extra_info("socket").setsockopt(
Expand Down
12 changes: 6 additions & 6 deletions src/firebolt/db/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import socket
from json import JSONDecodeError
from types import TracebackType
from typing import Any, Dict, Iterable, List, Optional
from typing import Any, Dict, List, Optional
from warnings import warn

from httpcore.backends.base import SOCKET_OPTION, NetworkStream
from httpcore.backends.base import NetworkStream
from httpcore.backends.sync import SyncBackend
from httpx import HTTPStatusError, HTTPTransport, RequestError, Timeout
from readerwriterlock.rwlock import RWLockWrite
Expand Down Expand Up @@ -125,20 +125,20 @@ class OverriddenHttpBackend(SyncBackend):
and `KEEPIDLE` settings.
"""

def connect_tcp(
def connect_tcp( # type: ignore [override]
self,
host: str,
port: int,
timeout: Optional[float] = None,
local_address: Optional[str] = None,
socket_options: Optional[Iterable[SOCKET_OPTION]] = None,
**kwargs: Any,
) -> NetworkStream:
stream = super().connect_tcp(
stream = super().connect_tcp( # type: ignore [call-arg]
host,
port,
timeout=timeout,
local_address=local_address,
socket_options=socket_options,
**kwargs,
)
# Enable keepalive
stream.get_extra_info("socket").setsockopt(
Expand Down