Skip to content

Commit

Permalink
master versionised some files
Browse files Browse the repository at this point in the history
  • Loading branch information
abhijeetmanhas committed Feb 15, 2020
1 parent acd042e commit 371828d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 33 deletions.
6 changes: 3 additions & 3 deletions sunpy/database/tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -385,10 +385,10 @@ def _from_fido_search_result_block(cls, sr_block, default_waveunit=None):

wavelengths = getattr(sr_block, 'wave', None)
wavelength_temp = {}
if isinstance(wavelengths, tuple):
if isinstance(wavelength_temp, tuple):
# Tuple of values
wavelength_temp['wavemin'] = wavelengths.wavemin
wavelength_temp['wavemax'] = wavelengths.wavemax
wavelength_temp['wavemin'] = wavelengths[0]
wavelength_temp['wavemax'] = wavelengths[1]
else:
# Single Value
wavelength_temp['wavemin'] = wavelength_temp['wavemax'] = wavelengths
Expand Down
3 changes: 1 addition & 2 deletions sunpy/net/attrs.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
from .base_client import BaseClient

# Trick the docs into thinking these attrs are defined in here.
for _a in (Time, Instrument, Wavelength, Level, Sample, Detector, Resolution,
Source, Physobs, Filter):
for _a in (Time, Instrument, Wavelength, Level, Sample, Detector, Resolution):
_a.__module__ = __name__


Expand Down
14 changes: 9 additions & 5 deletions sunpy/net/dataretriever/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,15 @@ def _makeargs(self, *args):
elif isinstance(elem, Range):
a_min = elem.min
a_max = elem.max
if isinstance(elem, Wavelength):
prefix = 'wave'
if a_min == a_max:
self.map_[elem.__class__.__name__.lower()] = a_min
else:
prefix = ''
minmax = namedtuple("minmax", "{0}min {0}max".format(prefix))
self.map_[elem.__class__.__name__.lower()] = minmax(a_min, a_max)
if isinstance(elem, Wavelength):
prefix = 'wave'
else:
prefix = ''
minmax = namedtuple("minmax", "{0}min {0}max".format(prefix))
self.map_[elem.__class__.__name__.lower()] = minmax(a_min, a_max)
else:
if hasattr(elem, 'value'):
self.map_[elem.__class__.__name__.lower()] = elem.value
Expand Down Expand Up @@ -268,6 +271,7 @@ def search(self, *args, **kwargs):
`sunpy.net.attrs` objects representing the query.
"""
GenericClient._makeargs(self, *args, **kwargs)

kwergs = copy.copy(self.map_)
kwergs.update(kwargs)
urls = self._get_url_for_timerange(
Expand Down
22 changes: 0 additions & 22 deletions sunpy/net/dataretriever/clients.py

This file was deleted.

2 changes: 1 addition & 1 deletion sunpy/net/dataretriever/tests/test_norh.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
)
])
def test_get_url_for_time_range(timerange, url_start, url_end):
urls = norh.NoRHClient()._get_url_for_timerange(timerange, wavelength=a.Wavelength(17*u.GHz))
urls = norh.NoRHClient()._get_url_for_timerange(timerange, wavelength=17*u.GHz)
assert isinstance(urls, list)
assert urls[0] == url_start
assert urls[-1] == url_end
Expand Down

0 comments on commit 371828d

Please sign in to comment.