Skip to content

use requests before read_csv to get auth #15

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
ocefpaf merged 2 commits into from
Dec 5, 2017
Merged

use requests before read_csv to get auth #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c013e8
use requests before read_csv to get auth
rsignell-usgs Dec 5, 2017
fa72459
Make request non-optional depdency
ocefpaf Dec 5, 2017
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
8 changes: 7 additions & 1 deletion erddapy/erddapy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from __future__ import (absolute_import, division, print_function)

import requests
Copy link
Member

@ocefpaf ocefpaf Dec 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rsignell-usgs if we leave this inside the function it would be to make it optional only when using get_var_by_attr.
In my next version requests will be mandatory , so instead of adding a try/except here I just moved it to the top already.


try:
from urllib.parse import quote_plus
except ImportError:
Expand Down Expand Up @@ -273,16 +275,20 @@ def get_var_by_attr(self, dataset_id, **kwargs):
['latitude', 'longitude', 'time', 'depth']

"""
from io import StringIO

try:
import pandas as pd

except ImportError:
raise ImportError('pandas is needed to use `get_var_by_attr`.')
info_url = self.get_info_url(dataset_id, response='csv')

# Creates the variables dictionary for the `get_var_by_attr` lookup.
if not self._variables or self._dataset_id != dataset_id:
variables = {}
_df = pd.read_csv(info_url)
r = requests.get(info_url, verify=True)
_df = pd.read_csv(StringIO(r.text))
self._dataset_id = dataset_id
for variable in set(_df['Variable Name']):
attributes = _df.loc[
Expand Down