Refactor: Made ipac/ned kwargs keyword only

Author: nkphysics

astroquery/ipac/ned/core.py

@@ -40,7 +40,7 @@ class NedClass(BaseQuery):
                       2: Options('Data as Published', 'pub'),
                       3: Options('Homogenized Units (mJy)', 'mjy')}
 
-    def query_object(self, object_name, get_query_payload=False,
+    def query_object(self, object_name, *, get_query_payload=False,
                      verbose=False):
         """
         Queries objects by name from the NED Service and returns the Main
@@ -71,7 +71,7 @@ def query_object(self, object_name, get_query_payload=False,
         result = self._parse_result(response, verbose=verbose)
         return result
 
-    def query_object_async(self, object_name, get_query_payload=False):
+    def query_object_async(self, object_name, *, get_query_payload=False):
         """
         Serves the same purpose as `~NedClass.query_object` but returns the
         raw HTTP response rather than the `astropy.table.Table` object.
@@ -101,7 +101,7 @@ def query_object_async(self, object_name, get_query_payload=False):
 
         return response
 
-    def query_region(self, coordinates, radius=1 * u.arcmin, equinox='J2000.0',
+    def query_region(self, coordinates, *, radius=1 * u.arcmin, equinox='J2000.0',
                      get_query_payload=False, verbose=False):
         """
         Used to query a region around a known identifier or given
@@ -144,7 +144,7 @@ def query_region(self, coordinates, radius=1 * u.arcmin, equinox='J2000.0',
         result = self._parse_result(response, verbose=verbose)
         return result
 
-    def query_region_async(self, coordinates, radius=1 * u.arcmin,
+    def query_region_async(self, coordinates, *, radius=1 * u.arcmin,
                            equinox='J2000.0', get_query_payload=False):
         """
         Serves the same purpose as `~NedClass.query_region` but returns the
@@ -206,7 +206,7 @@ def query_region_async(self, coordinates, radius=1 * u.arcmin,
                                  params=request_payload, timeout=Ned.TIMEOUT)
         return response
 
-    def query_region_iau(self, iau_name, frame='Equatorial', equinox='B1950.0',
+    def query_region_iau(self, iau_name, *, frame='Equatorial', equinox='B1950.0',
                          get_query_payload=False, verbose=False):
         """
         Used to query the Ned service via the IAU name. Equivalent to the
@@ -245,7 +245,7 @@ def query_region_iau(self, iau_name, frame='Equatorial', equinox='B1950.0',
         result = self._parse_result(response, verbose=verbose)
         return result
 
-    def query_region_iau_async(self, iau_name, frame='Equatorial',
+    def query_region_iau_async(self, iau_name, *, frame='Equatorial',
                                equinox='B1950.0', get_query_payload=False):
         """
         Serves the same purpose as `~NedClass.query_region_iau` but returns
@@ -285,7 +285,7 @@ def query_region_iau_async(self, iau_name, frame='Equatorial',
                                  params=request_payload, timeout=Ned.TIMEOUT)
         return response
 
-    def query_refcode(self, refcode, get_query_payload=False, verbose=False):
+    def query_refcode(self, refcode, *, get_query_payload=False, verbose=False):
         """
         Used to retrieve all objects contained in a particular
         reference. Equivalent to by refcode queries of the web interface.
@@ -314,7 +314,7 @@ def query_refcode(self, refcode, get_query_payload=False, verbose=False):
         result = self._parse_result(response, verbose=verbose)
         return result
 
-    def query_refcode_async(self, refcode, get_query_payload=False):
+    def query_refcode_async(self, refcode, *, get_query_payload=False):
         """
         Serves the same purpose as `~NedClass.query_region` but returns the
         raw HTTP response rather than the `astropy.table.Table` object.
@@ -344,7 +344,7 @@ def query_refcode_async(self, refcode, get_query_payload=False):
                                  params=request_payload, timeout=Ned.TIMEOUT)
         return response
 
-    def get_images(self, object_name, get_query_payload=False,
+    def get_images(self, object_name, *, get_query_payload=False,
                    show_progress=True):
         """
         Query function to fetch FITS images for a given identifier.
@@ -370,7 +370,7 @@ def get_images(self, object_name, get_query_payload=False,
             return readable_objs
         return [obj.get_fits() for obj in readable_objs]
 
-    def get_images_async(self, object_name, get_query_payload=False,
+    def get_images_async(self, object_name, *, get_query_payload=False,
                          show_progress=True):
         """
         Serves the same purpose as `~NedClass.get_images` but returns
@@ -397,7 +397,7 @@ def get_images_async(self, object_name, get_query_payload=False,
                                       show_progress=show_progress)
                 for U in image_urls]
 
-    def get_spectra(self, object_name, get_query_payload=False,
+    def get_spectra(self, object_name, *, get_query_payload=False,
                     show_progress=True):
         """
         Query function to fetch FITS files of spectra for a given identifier.
@@ -423,7 +423,7 @@ def get_spectra(self, object_name, get_query_payload=False,
             return readable_objs
         return [obj.get_fits() for obj in readable_objs]
 
-    def get_spectra_async(self, object_name, get_query_payload=False,
+    def get_spectra_async(self, object_name, *, get_query_payload=False,
                           show_progress=True):
         """
         Serves the same purpose as `~NedClass.get_spectra` but returns
@@ -490,7 +490,7 @@ def get_image_list(self, object_name, *, item='image', file_format='fits',
                                  timeout=Ned.TIMEOUT)
         return self._extract_image_urls(response.text, file_format=file_format)
 
-    def _extract_image_urls(self, html_in, file_format='fits'):
+    def _extract_image_urls(self, html_in, *, file_format='fits'):
         """
         Helper function that uses regexps to extract the image urls from the
         given HTML.
@@ -524,7 +524,7 @@ def _extract_image_urls(self, html_in, file_format='fits'):
         url_list = [base_url + img_url for img_url in matched_urls]
         return url_list
 
-    def get_table(self, object_name, table='photometry',
+    def get_table(self, object_name, *, table='photometry',
                   get_query_payload=False, verbose=False, **kwargs):
         """
         Fetches the specified data table for the object from NED and returns
@@ -574,7 +574,7 @@ def get_table(self, object_name, table='photometry',
         result = self._parse_result(response, verbose=verbose)
         return result
 
-    def get_table_async(self, object_name, table='photometry',
+    def get_table_async(self, object_name, *, table='photometry',
                         get_query_payload=False, **kwargs):
         """
         Serves the same purpose as `~NedClass.query_region` but returns the
@@ -678,7 +678,7 @@ def _set_output_options(self, request_payload):
         request_payload['out_equinox'] = conf.output_equinox
         request_payload['obj_sort'] = conf.sort_output_by
 
-    def _parse_result(self, response, verbose=False):
+    def _parse_result(self, response, *, verbose=False):
         """
         Parses the raw HTTP response and returns it as an
         `astropy.table.Table`.

astroquery/ipac/ned/tests/test_ned.py

@@ -167,7 +167,7 @@ def test_get_images(patch_get, patch_get_readable_fileobj):
 
 
 def test_query_refcode_async(patch_get):
-    response = ned.core.Ned.query_refcode_async('1997A&A...323...31K', True)
+    response = ned.core.Ned.query_refcode_async('1997A&A...323...31K', get_query_payload=True)
     assert response == {'search_type': 'Search',
                         'refcode': '1997A&A...323...31K',
                         'hconst': conf.hubble_constant,