Skip to content

Commit

Permalink
os.path.join -> urljoin to allow windows support (#36)
Browse files Browse the repository at this point in the history
This PR uses urllib to join urls to avoid issues on windows where the slash in path is a  backslash.
  • Loading branch information
Theodlz committed Apr 1, 2024
1 parent 4b4891f commit a92d173
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions penquins/penquins.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

__all__ = ["Kowalski", "__version__"]

import os
import secrets
import string
import traceback
from copy import deepcopy
from multiprocessing.pool import ThreadPool
from netrc import netrc
from typing import Mapping, Optional, Sequence, Union, Tuple
from urllib.parse import urljoin

import requests
from bson.json_util import loads
Expand Down Expand Up @@ -339,7 +339,7 @@ def ping(self, name=None) -> bool:
)
try:
resp = self.instances[name]["session"].get(
os.path.join(self.instances[name]["base_url"], ""),
urljoin(self.instances[name]["base_url"], ""),
headers=self.instances[name]["headers"],
)

Expand Down Expand Up @@ -377,13 +377,13 @@ def api(

if method != "get":
resp = self.instances[name]["methods"][method](
os.path.join(self.instances[name]["base_url"], endpoint),
urljoin(self.instances[name]["base_url"], endpoint),
json=data,
headers=self.instances[name]["headers"],
)
else:
resp = self.instances[name]["methods"][method](
os.path.join(self.instances[name]["base_url"], endpoint),
urljoin(self.instances[name]["base_url"], endpoint),
params=data,
headers=self.instances[name]["headers"],
)
Expand Down Expand Up @@ -643,7 +643,7 @@ def single_query(self, query_tpl: Tuple[Mapping, str]):
_query["kwargs"]["_id"] = _id

resp = self.instances[name]["session"].post(
os.path.join(self.instances[name]["base_url"], "api/queries"),
urljoin(self.instances[name]["base_url"], "api/queries"),
json=_query,
headers=self.instances[name]["headers"],
)
Expand Down

0 comments on commit a92d173

Please sign in to comment.