init variables under PortalAPI in discovery_portal.py. also code cleanup.

Author: jaymedina

astroquery/mast/discovery_portal.py

@@ -133,6 +133,9 @@ def __init__(self, session=None):
         self._column_configs = dict()
         self._current_service = None
 
+        self.tess_all_name = 'Mast.Catalogs.All.Tic'
+        self.dd_all_name = 'Mast.Catalogs.All.Disk.Detective'
+
     def _request(self, method, url, params=None, data=None, headers=None,
                  files=None, stream=False, auth=None, retrieve_all=True):
         """
@@ -238,10 +241,10 @@ def _get_col_config(self, service, fetch_name=None):
 
         more = False  # for some catalogs this is not enough information
         if "tess" in fetch_name.lower():
-            all_name = "Mast.Catalogs.All.Tic"
+            all_name = self.test_all_name
             more = True
         elif "dd." in fetch_name.lower():
-            all_name = "Mast.Catalogs.All.DiskDetective"
+            all_name = self.dd_all_name
             more = True
 
         if more:

astroquery/mast/observations.py

@@ -6,13 +6,10 @@
 This module contains various methods for querying MAST observations.
 """
 
-
-import ctypes
 import warnings
 import json
 import time
 import os
-import sys
 import uuid
 
 import numpy as np
@@ -40,8 +37,6 @@
 from . import conf, utils
 from .core import MastQueryWithLogin
 
-import astroquery
-
 __all__ = ['Observations', 'ObservationsClass',
            'MastClass', 'Mast']
 
@@ -91,10 +86,8 @@ def list_missions(self):
             List of available missions.
         """
 
-        # calling `service` variable
-        service = self.caom_all
-
         # getting all the histogram information
+        service = self.caom_all
         params = {}
         response = self._portal_api_connection.service_request_async(service, params, format='extjs')
         json_response = response[0].json()
@@ -108,7 +101,6 @@ def list_missions(self):
                 missions.remove('hist')
                 return missions
 
-
     def get_metadata(self, query_type):
         """
         Returns metadata about the requested query type.
@@ -170,7 +162,8 @@ def _parse_caom_criteria(self, **criteria):
                                                          **criteria)
             coordinates = utils.parse_input_location(coordinates, objectname)
         else:
-            mashup_filters = self._portal_api_connection.build_filter_set(self.caom_cone,                                                     self.caom_filtered,
+            mashup_filters = self._portal_api_connection.build_filter_set(self.caom_cone,
+                                                         self.caom_filtered,
                                                          **criteria)
 
         # handle position info (if any)