Process dataset elements with access children #122
Conversation
|
I'm guessing this will have some pep issues... |
lesserwhirls
force-pushed
the
access
branch
4 times, most recently
from
124431a
to
91431f6
Compare
siphon/catalog.py
Outdated
| # access_urls | ||
| has_access_element_info = \ | ||
| any(self.datasets[previous_dataset].access_element_info) | ||
| if has_access_element_info: |
There was a problem hiding this comment.
can be if dict...no need for any
siphon/catalog.py
Outdated
| @@ -297,8 +328,26 @@ def make_access_urls(self, catalog_url, all_services, metadata=None): | |||
| access_urls[service.service_type] = server_url + \ | |||
| service.base + self.url_path | |||
|
|
|||
| if any(self.access_element_info): | |||
There was a problem hiding this comment.
nuke this line - won't iterate over empty dict
siphon/catalog.py
Outdated
| for service_type in self.access_element_info: | ||
| url_path = self.access_element_info[service_type] | ||
| found_service = None | ||
| for service in all_services: |
There was a problem hiding this comment.
make all_services -> service.name use dict comprehension to clean up.
There was a problem hiding this comment.
reuse in line 317, too.
|
Looks like my quote-fixing spree is in conflict. Sorry, dude. |
|
Nah, that was an easy fix. I'll up updating the PR in the next few minutes. |
|
@dopplershift have you thought about turning off merge and squash+merge commits and just allowing the rebase and merge option? |
|
I've fallen out of favor with the rebase and merge button--I like seeing the split and merge for each PR. What I still want is the ability to rebase the branch from the web UI rather than the merge. |
|
More pep8. 😢 |
| 'Test parsing access elements in TDS client catalog' | ||
| url = 'http://oceandata.sci.gsfc.nasa.gov/opendap/SeaWiFS/L3SMI/2001/001/catalog.xml' | ||
| cat = TDSCatalog(url) | ||
| assert len(list(cat.datasets)) != 0 |
There was a problem hiding this comment.
sigh If we had only known and had written the test to check the correct length, which is 174.
Fix #114
Fix #115