Skip to content

Commit 0004ff0

Browse files
hhsieh00hhsieh00
committed
Revert "more codestyle issue fixes"
This reverts commit 804a662.
1 parent b1fb5f2 commit 0004ff0

File tree

1 file changed

+50
-50
lines changed

1 file changed

+50
-50
lines changed

‎astroquery/astorbdb/core.py‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ def colors_async(self, object_name, *,
225225
self.query_type = 'colors'
226226

227227
response = self._request('GET',
228-
url=self.URL + object_name + '/data/colors',
229-
timeout=self.TIMEOUT, cache=cache)
228+
url=self.URL + object_name + '/data/colors',
229+
timeout=self.TIMEOUT, cache=cache)
230230

231231
if get_raw_response:
232232
self._return_raw = True
@@ -277,7 +277,7 @@ def taxonomies_async(self, object_name, *,
277277

278278
return response
279279

280-
def lightcurves_async(self, object_name, *,
280+
def lightcurves_async(self, object_name, *,
281281
get_raw_response=False,
282282
get_uri=False,
283283
cache=True):
@@ -485,16 +485,16 @@ def all_astinfo_async(self, object_name, *,
485485
self._return_raw = True
486486

487487
if get_uri:
488-
self._uri = {'designations': response['designations'].url,
489-
'elements': response['elements'].url,
490-
'orbit': response['orbit'].url,
491-
'albedos': response['albedos'].url,
492-
'colors': response['colors'].url,
493-
'taxonomies': response['taxonomies'].url,
494-
'lightcurves': response['lightcurves'].url,
495-
'dynamicalfamily': response['dynamicalfamily'].url,
496-
'escaperoutes': response['escaperoutes'].url
497-
}
488+
self._uri = {'designations':response['designations'].url,
489+
'elements':response['elements'].url,
490+
'orbit':response['orbit'].url,
491+
'albedos':response['albedos'].url,
492+
'colors':response['colors'].url,
493+
'taxonomies':response['taxonomies'].url,
494+
'lightcurves':response['lightcurves'].url,
495+
'dynamicalfamily':response['dynamicalfamily'].url,
496+
'escaperoutes':response['escaperoutes'].url
497+
}
498498

499499
return response
500500

@@ -545,15 +545,15 @@ def _parse_result(self, response, *, verbose=None):
545545
src = self._process_data_escaperoutes(src)
546546

547547
if self.query_type == 'all_astinfo':
548-
src['designations'] = self._process_data_designations(src['designations'])
549-
src['elements'] = self._process_data_elements(src['elements'])
550-
src['orbit'] = self._process_data_orbit(src['orbit'])
551-
src['albedos'] = self._process_data_albedos(src['albedos'])
552-
src['colors'] = self._process_data_colors(src['colors'])
553-
src['taxonomies'] = self._process_data_taxonomies(src['taxonomies'])
554-
src['lightcurves'] = self._process_data_lightcurves(src['lightcurves'])
548+
src['designations'] = self._process_data_designations(src['designations'])
549+
src['elements'] = self._process_data_elements(src['elements'])
550+
src['orbit'] = self._process_data_orbit(src['orbit'])
551+
src['albedos'] = self._process_data_albedos(src['albedos'])
552+
src['colors'] = self._process_data_colors(src['colors'])
553+
src['taxonomies'] = self._process_data_taxonomies(src['taxonomies'])
554+
src['lightcurves'] = self._process_data_lightcurves(src['lightcurves'])
555555
src['dynamicalfamily'] = self._process_data_dynamicalfamily(src['dynamicalfamily'])
556-
src['escaperoutes'] = self._process_data_escaperoutes(src['escaperoutes'])
556+
src['escaperoutes'] = self._process_data_escaperoutes(src['escaperoutes'])
557557

558558
# add query uri, if desired
559559
if self._uri is not None:
@@ -581,32 +581,32 @@ def _process_data_elements(self, src):
581581

582582
if 'elements' in src:
583583
src = OrderedDict(src['elements'])
584-
src['a'] = u.Quantity(src['a'], u.au)
585-
src['aphelion_dist'] = u.Quantity(src['aphelion_dist'], u.au)
584+
src['a'] = u.Quantity(src['a'], u.au)
585+
src['aphelion_dist'] = u.Quantity(src['aphelion_dist'], u.au)
586586
if src['delta_v'] is not None:
587-
src['delta_v'] = u.Quantity(src['delta_v'], u.km/u.s)
588-
src['ecc_anomaly'] = u.Quantity(src['ecc_anomaly'], u.deg)
589-
src['epoch'] = Time(src['epoch'], format='isot', scale='utc')
590-
src['h'] = u.Quantity(src['h'], u.mag)
591-
src['i'] = u.Quantity(src['m'], u.deg)
587+
src['delta_v'] = u.Quantity(src['delta_v'], u.km/u.s)
588+
src['ecc_anomaly'] = u.Quantity(src['ecc_anomaly'], u.deg)
589+
src['epoch'] = Time(src['epoch'], format='isot', scale='utc')
590+
src['h'] = u.Quantity(src['h'], u.mag)
591+
src['i'] = u.Quantity(src['m'], u.deg)
592592
src['long_of_perihelion'] = u.Quantity(src['long_of_perihelion'], u.deg)
593-
src['m'] = u.Quantity(src['m'], u.deg)
594-
src['moid_earth'] = u.Quantity(src['moid_earth'], u.au)
595-
src['moid_jupiter'] = u.Quantity(src['moid_jupiter'], u.au)
596-
src['moid_mars'] = u.Quantity(src['moid_mars'], u.au)
597-
src['moid_mercury'] = u.Quantity(src['moid_mercury'], u.au)
598-
src['moid_neptune'] = u.Quantity(src['moid_neptune'], u.au)
599-
src['moid_saturn'] = u.Quantity(src['moid_saturn'], u.au)
600-
src['moid_uranus'] = u.Quantity(src['moid_uranus'], u.au)
601-
src['moid_venus'] = u.Quantity(src['moid_venus'], u.au)
602-
src['node'] = u.Quantity(src['node'], u.deg)
603-
src['peri'] = u.Quantity(src['peri'], u.deg)
604-
src['q'] = u.Quantity(src['q'], u.au)
605-
src['r'] = u.Quantity(src['r'], u.au)
606-
src['true_anomaly'] = u.Quantity(src['true_anomaly'], u.deg)
607-
src['x'] = u.Quantity(src['x'], u.au)
608-
src['y'] = u.Quantity(src['y'], u.au)
609-
src['z'] = u.Quantity(src['z'], u.au)
593+
src['m'] = u.Quantity(src['m'], u.deg)
594+
src['moid_earth'] = u.Quantity(src['moid_earth'], u.au)
595+
src['moid_jupiter'] = u.Quantity(src['moid_jupiter'], u.au)
596+
src['moid_mars'] = u.Quantity(src['moid_mars'], u.au)
597+
src['moid_mercury'] = u.Quantity(src['moid_mercury'], u.au)
598+
src['moid_neptune'] = u.Quantity(src['moid_neptune'], u.au)
599+
src['moid_saturn'] = u.Quantity(src['moid_saturn'], u.au)
600+
src['moid_uranus'] = u.Quantity(src['moid_uranus'], u.au)
601+
src['moid_venus'] = u.Quantity(src['moid_venus'], u.au)
602+
src['node'] = u.Quantity(src['node'], u.deg)
603+
src['peri'] = u.Quantity(src['peri'], u.deg)
604+
src['q'] = u.Quantity(src['q'], u.au)
605+
src['r'] = u.Quantity(src['r'], u.au)
606+
src['true_anomaly'] = u.Quantity(src['true_anomaly'], u.deg)
607+
src['x'] = u.Quantity(src['x'], u.au)
608+
src['y'] = u.Quantity(src['y'], u.au)
609+
src['z'] = u.Quantity(src['z'], u.au)
610610

611611
return src
612612

@@ -619,10 +619,10 @@ def _process_data_orbit(self, src):
619619

620620
if 'orbit' in src:
621621
src = OrderedDict(src['orbit'])
622-
src['a1con'] = u.Quantity(src['a1con'], u.au/(u.d ** 2))
623-
src['a2con'] = u.Quantity(src['a2con'], u.au/(u.d ** 2))
624-
src['a3con'] = u.Quantity(src['a3con'], u.au/(u.d ** 2))
625-
src['arc'] = u.Quantity(src['arc'], u.yr)
622+
src['a1con'] = u.Quantity(src['a1con'], u.au/(u.d ** 2))
623+
src['a2con'] = u.Quantity(src['a2con'], u.au/(u.d ** 2))
624+
src['a3con'] = u.Quantity(src['a3con'], u.au/(u.d ** 2))
625+
src['arc'] = u.Quantity(src['arc'], u.yr)
626626

627627
return src
628628

@@ -680,7 +680,7 @@ def _process_data_lightcurves(self, src):
680680
src[i]['amp_max'] = u.Quantity(src[i]['amp_max'], u.mag)
681681
if src[i]['amp_min'] is not None:
682682
src[i]['amp_min'] = u.Quantity(src[i]['amp_min'], u.mag)
683-
src[i]['period'] = u.Quantity(src[i]['period'], u.h)
683+
src[i]['period'] = u.Quantity(src[i]['period'], u.h)
684684

685685
return src
686686

0 commit comments

Comments
 (0)