diff --git a/gliderpy/fetchers.py b/gliderpy/fetchers.py index 2c5326d..009d915 100644 --- a/gliderpy/fetchers.py +++ b/gliderpy/fetchers.py @@ -16,6 +16,7 @@ ) OptionalBool = bool | None +OptionalDF = pd.DataFrame | None OptionalDict = dict | None OptionalList = list[str] | tuple[str] | None OptionalStr = str | None @@ -80,7 +81,7 @@ def __init__( ) self.fetcher.variables = server_vars[server] self.fetcher.dataset_id: OptionalStr = None - self.datasets: OptionalBool = None + self.datasets: OptionalDF = None def to_pandas(self: "GliderDataFetcher") -> pd.DataFrame: """Return data from the server as a pandas dataframe. @@ -97,10 +98,7 @@ def to_pandas(self: "GliderDataFetcher") -> pd.DataFrame: self.fetcher.dataset_id = None return glider_df else: - msg = ( - f"Must provide a {self.fetcher.dataset_id} or " - "`query` terms to download data." - ) + msg = "Must provide a dataset_id or query terms to download data." raise ValueError(msg) # Standardize variable names for the single dataset_id. @@ -145,7 +143,7 @@ def query( # noqa: PLR0913 "longitude>=": min_lon, "longitude<=": max_lon, } - if not self.datasets: + if self.datasets is None: url = self.fetcher.get_search_url( search_for="glider", response="csv",