Minor issues resolved

Author: jespinosa

astroquery/esa/hubble/core.py

@@ -102,8 +102,7 @@ def download_product(self, observation_id, *, calibration_level=None,
             params["CALIBRATION_LEVEL"] = calibration_level
             url += "&CALIBRATION_LEVEL=" + calibration_level
 
-        if "product_type" in kwargs:
-            product_type = kwargs["product_type"]
+        if product_type:
             self.__validate_product_type(product_type)
             params["RETRIEVAL_TYPE"] = product_type
             filename = self._get_product_filename(product_type, filename)
@@ -219,18 +218,18 @@ def get_postcard(self, observation_id, calibration_level="RAW",
 
         shutil.move(response, filename)
 
-    def cone_search(self, coordinates, radius=0.0, filename=None,
-                    output_format='votable', async_job=False,
-                    cache=True, verbose=False):
+    def cone_search(self, coordinates, radius, filename=None,
+                    output_format='votable', cache=True,
+                    async_job=False, verbose=False):
         """
         To execute a cone search defined by a coordinate and a radius
 
         Parameters
         ----------
+        radius : float
+            radius in arcmin of the cone_search
         coordinates : astropy.coordinate, mandatory
             coordinates of the center in the cone search
-        radius : float, default 0
-            radius in arcmin of the cone_search
         filename : str, default None
             Path and name of the file to store the results.
             If the filename is defined, the file will be
@@ -285,8 +284,8 @@ def cone_search(self, coordinates, radius=0.0, filename=None,
                                    verbose=verbose)
         return table
 
-    def cone_search_criteria(self, target=None, coordinates=None,
-                             radius=0.0,
+    def cone_search_criteria(self, radius, target=None,
+                             coordinates=None,
                              calibration_level=None,
                              data_product_type=None,
                              intent=None,
@@ -308,12 +307,12 @@ def cone_search_criteria(self, target=None, coordinates=None,
 
         Parameters
         ----------
+        radius : float
+            radius in arcmin of the cone_search
         target : str, mandatory if no coordinates is provided
             name of the target, that will act as center in the cone search
         coordinates : astropy.coordinate, mandatory if no target is provided
             coordinates of the center in the cone search
-        radius : float, default 0
-            radius in arcmin of the cone_search
         calibration_level : str or int, optional
             The identifier of the data reduction/processing applied to the
             data. RAW (1), CALIBRATED (2), PRODUCT (3) or AUXILIARY (0)

astroquery/esa/hubble/tests/test_esa_hubble.py

@@ -42,7 +42,7 @@ def get_mockreturn(method, request, url, params, *args, **kwargs):
 def ehst_request(request):
     try:
         mp = request.getfixturevalue("monkeypatch")
-    except AttributeError:  # pytest < 3
+    except AttributeError:
         mp = request.getfuncargvalue("monkeypatch")
     mp.setattr(ESAHubbleClass, '_request', get_mockreturn)
     return mp
@@ -59,10 +59,7 @@ def get_cone_mockreturn(method, request, url, params, *args, **kwargs):
 
 @pytest.fixture(autouse=True)
 def ehst_cone_search(request):
-    try:
-        mp = request.getfixturevalue("monkeypatch")
-    except AttributeError:  # pytest < 3
-        mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(ESAHubbleClass, 'cone_search', get_cone_mockreturn)
     return mp