Skip to content

fix(FIR-34234): windows-compatible url parsing #393

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 2 commits into from
Jul 10, 2024
Merged

fix(FIR-34234): windows-compatible url parsing #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
774dd51
fix(FIR-34234): use os-specific separators for path
ptiurin Jul 5, 2024
cfe65ed
ulrjoin instead
ptiurin Jul 5, 2024
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
6 changes: 3 additions & 3 deletions src/firebolt/async_db/cursor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from __future__ import annotations

import logging
import os
import time
from abc import ABCMeta, abstractmethod
from functools import wraps
Expand All @@ -16,6 +15,7 @@
Tuple,
Union,
)
from urllib.parse import urljoin

from httpx import URL, Headers, Response, codes

Expand Down Expand Up @@ -381,7 +381,7 @@ async def _api_request(
if self.parameters:
parameters = {**self.parameters, **parameters}
return await self._client.request(
url=os.path.join(self.engine_url, path or ""),
url=urljoin(self.engine_url.rstrip("/") + "/", path or ""),
method="POST",
params=parameters,
content=query,
Expand Down Expand Up @@ -451,7 +451,7 @@ async def _api_request(
if self.parameters:
parameters = {**self.parameters, **parameters}
return await self._client.request(
url=os.path.join(self.engine_url, path or ""),
url=urljoin(self.engine_url.rstrip("/") + "/", path or ""),
method="POST",
params={
**(parameters or dict()),
Expand Down
6 changes: 3 additions & 3 deletions src/firebolt/db/cursor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from __future__ import annotations

import logging
import os
import time
from abc import ABCMeta, abstractmethod
from typing import (
Expand All @@ -14,6 +13,7 @@
Tuple,
Union,
)
from urllib.parse import urljoin

from httpx import URL, Headers, Response, codes

Expand Down Expand Up @@ -331,7 +331,7 @@ def _api_request(
if self.parameters:
parameters = {**self.parameters, **parameters}
return self._client.request(
url=os.path.join(self.engine_url, path or ""),
url=urljoin(self.engine_url.rstrip("/") + "/", path or ""),
method="POST",
params=parameters,
content=query,
Expand Down Expand Up @@ -398,7 +398,7 @@ def _api_request(
if self.parameters:
parameters = {**self.parameters, **parameters}
return self._client.request(
url=os.path.join(self.engine_url, path or ""),
url=urljoin(self.engine_url.rstrip("/") + "/", path or ""),
method="POST",
params={
**(parameters or dict()),
Expand Down