Merge pull request #1890 from tinumide/issue-1572 [nodeploy]

change single letter internal variables #1572

Author: bsipocz

astroquery/sdss/core.py

@@ -564,10 +564,10 @@ def get_spectra_async(self, coordinates=None, radius=2. * u.arcsec,
                 return request_payload
 
             url = self._get_query_url(data_release)
-            r = self._request("GET", url, params=request_payload,
+            result = self._request("GET", url, params=request_payload,
                               timeout=timeout, cache=cache)
 
-            matches = self._parse_result(r)
+            matches = self._parse_result(result)
             if matches is None:
                 warnings.warn("Query returned no results.", NoResultsWarning)
                 return
@@ -720,9 +720,9 @@ def get_images_async(self, coordinates=None, radius=2. * u.arcsec,
                 return request_payload
 
             url = self._get_query_url(data_release)
-            r = self._request("GET", url, params=request_payload,
+            result = self._request("GET", url, params=request_payload,
                               timeout=timeout, cache=cache)
-            matches = self._parse_result(r)
+            matches = self._parse_result(result)
             if matches is None:
                 warnings.warn("Query returned no results.", NoResultsWarning)
                 return

astroquery/sdss/tests/test_sdss.py

@@ -78,9 +78,9 @@ def get_readable_fileobj_mockreturn(filename, **kwargs):
 def patch_get_readable_fileobj_slow(request):
     @contextmanager
     def get_readable_fileobj_mockreturn(filename, **kwargs):
-        e = six.moves.urllib_error.URLError('timeout')
-        e.reason = socket.timeout()
-        raise e
+        error = six.moves.urllib_error.URLError('timeout')
+        error.reason = socket.timeout()
+        raise error
         yield True
     try:
         mp = request.getfixturevalue("monkeypatch")

astroquery/sha/core.py

@@ -144,8 +144,8 @@ def parse_line(line, cs=cs):
     dtypes = _map_dtypes(type_names, field_widths)
     # To table
     # transpose data for appropriate table instance handling
-    t = Table(list(zip(*data)), names=col_names, dtype=dtypes)
-    return t
+    table = Table(list(zip(*data)), names=col_names, dtype=dtypes)
+    return table
 
 
 def save_file(url, out_dir='sha_tmp/', out_name=None):

astroquery/simbad/core.py

@@ -27,8 +27,8 @@
 
 
 def validate_epoch(value):
-    p = re.compile(r'^[JB]\d+[.]?\d+$', re.IGNORECASE)
-    if p.match(value) is None:
+    pattern = re.compile(r'^[JB]\d+[.]?\d+$', re.IGNORECASE)
+    if pattern.match(value) is None:
         raise ValueError("Epoch must be specified as [J|B]<epoch>.\n"
                          "Example: epoch='J2000'")
     return value
@@ -67,7 +67,7 @@ def wrapper(*args, **kwargs):
     return wrapper
 
 
-def strip_field(f, keep_filters=False):
+def strip_field(field, keep_filters=False):
     """Helper tool: remove parameters from VOTABLE fields
     However, this should only be applied to a subset of VOTABLE fields:
 
@@ -80,14 +80,14 @@ def strip_field(f, keep_filters=False):
 
     *if* keep_filters is specified
     """
-    if '(' in f:
-        root = f[:f.find('(')]
+    if '(' in field:
+        root = field[:field.find('(')]
         if (root in ('ra', 'dec', 'otype', 'id', 'coo', 'bibcodelist') or
                 not keep_filters):
             return root
 
     # the overall else (default option)
-    return f
+    return field
 
 
 error_regex = re.compile(r'(?ms)\[(?P<line>\d+)\]\s?(?P<msg>.+?)(\[|\Z)')
@@ -1068,10 +1068,10 @@ def _parse_result(self, result, resultclass=SimbadVOTableResult,
 
 def _parse_coordinates(coordinates):
     try:
-        c = commons.parse_coordinates(coordinates)
+        coordinates = commons.parse_coordinates(coordinates)
         # now c has some subclass of astropy.coordinate
         # get ra, dec and frame
-        return _get_frame_coords(c)
+        return _get_frame_coords(coordinates)
     except (u.UnitsError, TypeError):
         raise ValueError("Coordinates not specified correctly")
 
@@ -1085,29 +1085,29 @@ def _has_length(x):
         return False
 
 
-def _get_frame_coords(c):
-    if _has_length(c):
+def _get_frame_coords(coordinates):
+    if _has_length(coordinates):
         # deal with vectors differently
-        parsed = [_get_frame_coords(cc) for cc in c]
+        parsed = [_get_frame_coords(cc) for cc in coordinates]
         return ([ra for ra, dec, frame in parsed],
                 [dec for ra, dec, frame in parsed],
                 [frame for ra, dec, frame in parsed])
-    if c.frame.name == 'icrs':
-        ra, dec = _to_simbad_format(c.ra, c.dec)
+    if coordinates.frame.name == 'icrs':
+        ra, dec = _to_simbad_format(coordinates.ra, coordinates.dec)
         return (ra, dec, 'ICRS')
-    elif c.frame.name == 'galactic':
-        lon, lat = (str(c.l.degree), str(c.b.degree))
+    elif coordinates.frame.name == 'galactic':
+        lon, lat = (str(coordinates.l.degree), str(coordinates.b.degree))
         if lat[0] not in ['+', '-']:
             lat = '+' + lat
         return (lon, lat, 'GAL')
-    elif c.frame.name == 'fk4':
-        ra, dec = _to_simbad_format(c.ra, c.dec)
+    elif coordinates.frame.name == 'fk4':
+        ra, dec = _to_simbad_format(coordinates.ra, coordinates.dec)
         return (ra, dec, 'FK4')
-    elif c.frame.name == 'fk5':
-        ra, dec = _to_simbad_format(c.ra, c.dec)
+    elif coordinates.frame.name == 'fk5':
+        ra, dec = _to_simbad_format(coordinates.ra, coordinates.dec)
         return (ra, dec, 'FK5')
     else:
-        raise ValueError("%s is not a valid coordinate" % c)
+        raise ValueError("%s is not a valid coordinate" % coordinates)
 
 
 def _to_simbad_format(ra, dec):

astroquery/simbad/tests/test_simbad.py

@@ -113,9 +113,9 @@ def test_get_frame_coordinates(coordinates, expected_frame):
     actual_frame = simbad.core._get_frame_coords(coordinates)[2]
     assert actual_frame == expected_frame
     if actual_frame == 'GAL':
-        l, b = simbad.core._get_frame_coords(coordinates)[:2]
-        np.testing.assert_almost_equal(float(l) % 360, -67.02084 % 360)
-        np.testing.assert_almost_equal(float(b), -29.75447)
+        l_gal, b_gal = simbad.core._get_frame_coords(coordinates)[:2]
+        np.testing.assert_almost_equal(float(l_gal) % 360, -67.02084 % 360)
+        np.testing.assert_almost_equal(float(b_gal), -29.75447)
 
 
 def test_parse_result():

astroquery/splatalogue/load_species_table.py

@@ -66,11 +66,11 @@ def species_lookuptable(filename='splat-species.json', recache=False):
     # check to see if the file exists; if not, we run the
     # scraping routine
     if recache or not os.path.isfile(file_cache):
-        J = get_json_species_ids(filename)
+        species = get_json_species_ids(filename)
     else:
         with open(data_path(filename), 'r') as f:
-            J = json.load(f)
-    lookuptable = SpeciesLookuptable(dict((v, k) for d in J.values()
+            species = json.load(f)
+    lookuptable = SpeciesLookuptable(dict((v, k) for d in species.values()
                                           for k, v in d.items()))
 
     return lookuptable