From 2349bff5a05930aaabe0f710c06473fbdd1d2ba8 Mon Sep 17 00:00:00 2001
From: Vini Salazar <17276653+vinisalazar@users.noreply.github.com>
Date: Wed, 30 Nov 2022 12:54:19 +1100
Subject: [PATCH] Remove remaining ** from urlopen methods

  - Code review for #280
---
 erddapy/core/interfaces.py | 2 +-
 erddapy/core/netcdf.py     | 2 +-
 erddapy/core/url.py        | 3 +--
 erddapy/erddapy.py         | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/erddapy/core/interfaces.py b/erddapy/core/interfaces.py
index 59c3947c..305869c8 100644
--- a/erddapy/core/interfaces.py
+++ b/erddapy/core/interfaces.py
@@ -32,7 +32,7 @@ def to_pandas(
         requests_kwargs = {}
     if pandas_kwargs is None:
         pandas_kwargs = {}
-    data = urlopen(url, **requests_kwargs)
+    data = urlopen(url, requests_kwargs)
     try:
         return pd.read_csv(data, **pandas_kwargs)
     except Exception as e:
diff --git a/erddapy/core/netcdf.py b/erddapy/core/netcdf.py
index d3d24b24..768adf8b 100644
--- a/erddapy/core/netcdf.py
+++ b/erddapy/core/netcdf.py
@@ -13,7 +13,7 @@ def _nc_dataset(url, **requests_kwargs: Dict):
     """Return a netCDF4-python Dataset from memory and fallbacks to disk if that fails."""
     from netCDF4 import Dataset
 
-    data = urlopen(url=url, **requests_kwargs)
+    data = urlopen(url, requests_kwargs)
     try:
         return Dataset(Path(urlparse(url).path).name, memory=data.read())
     except OSError:
diff --git a/erddapy/core/url.py b/erddapy/core/url.py
index b164e889..a2368f13 100644
--- a/erddapy/core/url.py
+++ b/erddapy/core/url.py
@@ -28,7 +28,6 @@ def _urlopen(url: str, auth: Optional[tuple] = None, **kwargs: Dict) -> BinaryIO
 
 def urlopen(
     url: str,
-    auth: Optional[tuple] = None,
     requests_kwargs: Optional[Dict] = None,
 ) -> BinaryIO:
     """Thin wrapper around httpx get content.
@@ -39,7 +38,7 @@ def urlopen(
     # Ignoring type checks here b/c mypy does not support decorated functions.
     if requests_kwargs is None:
         requests_kwargs = {}
-    data = _urlopen(url=url, auth=auth, **requests_kwargs)  # type: ignore
+    data = _urlopen(url, **requests_kwargs)  # type: ignore
     data.seek(0)
     return data
 
diff --git a/erddapy/erddapy.py b/erddapy/erddapy.py
index b3fb8719..a03f4e1e 100644
--- a/erddapy/erddapy.py
+++ b/erddapy/erddapy.py
@@ -393,7 +393,7 @@ def _get_variables(self, dataset_id: OptionalStr = None) -> Dict:
         url = self.get_info_url(dataset_id=dataset_id, response="csv")
 
         variables = {}
-        data = urlopen(url, auth=self.auth, **self.requests_kwargs)
+        data = urlopen(url, self.requests_kwargs)
         _df = pd.read_csv(data)
         self._dataset_id = dataset_id
         for variable in set(_df["Variable Name"]):