Bug fixes

Author: snbianco

astroquery/mast/tests/test_mast_remote.py

@@ -570,15 +570,15 @@ def test_observations_get_product_list_async(self):
         responses = Observations.get_product_list_async(test_obs[2:3])
         assert isinstance(responses, list)
 
-        observations = Observations.query_object("M8", radius=".02 deg")
+        observations = Observations.query_criteria(objectname="M8", obs_collection=["K2", "IUE"])
         responses = Observations.get_product_list_async(observations[0])
         assert isinstance(responses, list)
 
         responses = Observations.get_product_list_async(observations[0:4])
         assert isinstance(responses, list)
 
     def test_observations_get_product_list(self):
-        observations = Observations.query_object("M8", radius=".04 deg")
+        observations = Observations.query_criteria(objectname='M8', obs_collection=['K2', 'IUE'])
         test_obs_id = str(observations[0]['obsid'])
         mult_obs_ids = str(observations[0]['obsid']) + ',' + str(observations[1]['obsid'])
 
@@ -598,7 +598,7 @@ def test_observations_get_product_list(self):
         assert len(result1) == len(result2)
         assert set(filenames1) == set(filenames2)
 
-        obsLoc = np.where(observations["obs_id"] == 'ktwo200071160-c92_lc')
+        obsLoc = np.where(observations['obs_id'] == 'ktwo200071160-c92_lc')
         result = Observations.get_product_list(observations[obsLoc])
         assert isinstance(result, Table)
         assert len(result) == 1

astroquery/mast/utils.py

@@ -330,11 +330,11 @@ def remove_duplicate_products(data_products, uri_key):
         Table containing products with unique dataURIs.
     """
     # Get unique products based on input type
-    seen = set()
     if isinstance(data_products, Table):
-        unique_rows = [row for row in data_products if not (row[uri_key] in seen or seen.add(row[uri_key]))]
-        unique_products = type(data_products)(rows=unique_rows)
-    else:  # Assume data_products is a list of URIs
+        _, unique_indices = np.unique(data_products[uri_key], return_index=True)
+        unique_products = data_products[np.sort(unique_indices)]
+    else:  # list of URIs
+        seen = set()
         unique_products = [uri for uri in data_products if not (uri in seen or seen.add(uri))]
 
     duplicates_removed = len(data_products) - len(unique_products)