replacing class variable call with explicit class name to class variable call using self

Author: jaymedina

astroquery/mast/observations.py

@@ -92,7 +92,7 @@ def list_missions(self):
         """
 
         # calling `service` variable
-        service = Observations.caom_all
+        service = self.caom_all
 
         # getting all the histogram information
         params = {}
@@ -125,9 +125,9 @@ def get_metadata(self, query_type):
         """
 
         if query_type.lower() == "observations":
-            colconf_name = ObservationsClass.caom_cone
+            colconf_name = self.caom_cone
         elif query_type.lower() == "products":
-            colconf_name = ObservationsClass.caom_products
+            colconf_name = self.caom_products
         else:
             raise InvalidQueryError("Unknown query type.")
 
@@ -165,14 +165,13 @@ def _parse_caom_criteria(self, **criteria):
 
         # Build the mashup filter object and store it in the correct service_name entry
         if coordinates or objectname:
-            mashup_filters = self._portal_api_connection.build_filter_set(ObservationsClass.caom_cone,
-                                                                           ObservationsClass.caom_filtered_position,
-                                                                           **criteria)
+            mashup_filters = self._portal_api_connection.build_filter_set(self.caom_cone,
+                                                         self.caom_filtered_position,
+                                                         **criteria)
             coordinates = utils.parse_input_location(coordinates, objectname)
         else:
-            mashup_filters = self._portal_api_connection.build_filter_set(ObservationsClass.caom_cone,
-                                                                           ObservationsClass.caom_filtered,
-                                                                           **criteria)
+            mashup_filters = self._portal_api_connection.build_filter_set(self.caom_cone,                                                     self.caom_filtered,
+                                                         **criteria)
 
         # handle position info (if any)
         position = None
@@ -222,7 +221,7 @@ def query_region_async(self, coordinates, radius=0.2*u.deg, pagesize=None, page=
         # if radius is just a number we assume degrees
         radius = coord.Angle(radius, u.deg)
 
-        service = ObservationsClass.caom_cone
+        service = self.caom_cone
         params = {'ra': coordinates.ra.deg,
                   'dec': coordinates.dec.deg,
                   'radius': radius.deg}
@@ -299,12 +298,12 @@ def query_criteria_async(self, pagesize=None, page=None, **criteria):
             raise InvalidQueryError("At least one non-positional criterion must be supplied.")
 
         if position:
-            service = ObservationsClass.caom_filtered_position
+            service = self.caom_filtered_position
             params = {"columns": "*",
                       "filters": mashup_filters,
                       "position": position}
         else:
-            service = ObservationsClass.caom_filtered
+            service = self.caom_filtered
             params = {"columns": "*",
                       "filters": mashup_filters}
 
@@ -344,7 +343,7 @@ def query_region_count(self, coordinates, radius=0.2*u.deg, pagesize=None, page=
         # turn coordinates into the format
         position = ', '.join([str(x) for x in (coordinates.ra.deg, coordinates.dec.deg, radius.deg)])
 
-        service = ObservationsClass.caom_filtered_position
+        service = self.caom_filtered_position
         params = {"columns": "COUNT_BIG(*)",
                   "filters": [],
                   "position": position}
@@ -412,12 +411,12 @@ def query_criteria_count(self, pagesize=None, page=None, **criteria):
 
         # send query
         if position:
-            service = ObservationsClass.caom_filtered_position
+            service = self.caom_filtered_position
             params = {"columns": "COUNT_BIG(*)",
                       "filters": mashup_filters,
                       "position": position}
         else:
-            service = ObservationsClass.caom_filtered
+            service = self.caom_filtered
             params = {"columns": "COUNT_BIG(*)",
                       "filters": mashup_filters}
 
@@ -453,7 +452,7 @@ def get_product_list_async(self, observations):
         if len(observations) == 0:
             raise InvalidQueryError("Observation list is empty, no associated products.")
 
-        service = ObservationsClass.caom_products
+        service = self.caom_products
         params = {'obsid': ','.join(observations)}
 
         return self._portal_api_connection.service_request_async(service, params)