Skip to content

Commit 0de7920

Browse files
committed
don't use env vars
1 parent 3ee6d2d commit 0de7920

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

erddapy/core/url.py

+11-9
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import copy
44
import functools
55
import io
6-
import os
76
from datetime import datetime
87
from typing import BinaryIO, Dict, List, Optional, Tuple, Union
98
from urllib.parse import quote_plus, urlparse
@@ -20,18 +19,21 @@
2019
def _urlopen(url: str, auth: Optional[tuple] = None, **kwargs: Dict) -> BinaryIO:
2120
if "timeout" not in kwargs.keys():
2221
kwargs["timeout"] = 60
22+
user = kwargs.pop("user", None)
23+
password = kwargs.pop("password", None)
2324
with httpx.Client() as client:
2425
p = urlparse(url)
2526
protocol = "tabledap" if "tabledap" in p.path else "griddap"
2627
base = p.path.split(f"/{protocol}/")[0]
27-
login_page = f"{p.scheme}://{p.netloc}{base}/login.html"
28-
client.post(
29-
login_page,
30-
data={
31-
"user": os.getenv("ERDDAP_USERNAME"),
32-
"password": os.getenv("ERDDAP_PASSWORD"),
33-
},
34-
)
28+
if user is not None and password is not None:
29+
login_page = f"{p.scheme}://{p.netloc}{base}/login.html"
30+
client.post(
31+
login_page,
32+
data={
33+
"user": f"{user}",
34+
"password": f"{password}",
35+
},
36+
)
3537
response = client.get(url, follow_redirects=True, auth=auth, **kwargs)
3638

3739
try:

erddapy/erddapy.py

+1
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@ def to_pandas(
358358
response = kw.pop("response", "csvp")
359359
distinct = kw.pop("distinct", False)
360360
url = self.get_download_url(response=response, distinct=distinct)
361+
requests_kwargs = requests_kwargs if requests_kwargs else self.requests_kwargs
361362
return to_pandas(url, requests_kwargs=requests_kwargs, pandas_kwargs=dict(**kw))
362363

363364
def to_ncCF(self, protocol: str = None, **kw):

0 commit comments

Comments
 (0)