Remove six

The package `six` allows for writing code that works with both Python 2
and 3, but because Python 2 is no longer supported, `six` no longer
serves a purpose. This commit removes `six` from `astroquery`.

Author: eerovaher

astroquery/alma/core.py

@@ -12,8 +12,7 @@
 from bs4 import BeautifulSoup
 import pyvo
 
-from six.moves.urllib_parse import urljoin
-import six
+from urllib.parse import urljoin
 from astropy.table import Table, Column, vstack
 from astroquery import log
 from astropy.utils import deprecated
@@ -567,7 +566,7 @@ def get_data_info(self, uids, expand_tarfiles=False,
         """
         if uids is None:
             raise AttributeError('UIDs required')
-        if isinstance(uids, six.string_types + (np.bytes_,)):
+        if isinstance(uids, (str, bytes)):
             uids = [uids]
         if not isinstance(uids, (list, tuple, np.ndarray)):
             raise TypeError("Datasets must be given as a list of strings.")
@@ -811,7 +810,7 @@ def retrieve_data_from_uid(self, uids, cache=True):
         downloaded_files : list
             A list of the downloaded file paths
         """
-        if isinstance(uids, six.string_types + (np.bytes_,)):
+        if isinstance(uids, (str, bytes)):
             uids = [uids]
         if not isinstance(uids, (list, tuple, np.ndarray)):
             raise TypeError("Datasets must be given as a list of strings.")
@@ -1073,7 +1072,7 @@ def download_and_extract_files(self, urls, delete=True, regex=r'.*\.fits$',
             data from an ASDM tarball
         """
 
-        if isinstance(urls, six.string_types):
+        if isinstance(urls, str):
             urls = [urls]
         if not isinstance(urls, (list, tuple, np.ndarray)):
             raise TypeError("Datasets must be given as a list of strings.")
@@ -1174,7 +1173,6 @@ def _json_summary_to_table(self, data, base_url):
         March 2020 - should be removed along with stage_data_prefeb2020
         """
         from ..utils import url_helpers
-        from six import iteritems
         columns = {'mous_uid': [], 'URL': [], 'size': []}
         for entry in data['node_data']:
             # de_type can be useful (e.g., MOUS), but it is not necessarily
@@ -1212,7 +1210,7 @@ def _json_summary_to_table(self, data, base_url):
 
         columns['size'] = u.Quantity(columns['size'], u.Gbyte)
 
-        tbl = Table([Column(name=k, data=v) for k, v in iteritems(columns)])
+        tbl = Table([Column(name=k, data=v) for k, v in columns.items()])
         return tbl
 
     def get_project_metadata(self, projectid, cache=True):

astroquery/astrometry_net/core.py

@@ -3,8 +3,6 @@
 
 import json
 
-import six
-from six import string_types
 from astropy.io import fits
 from astroquery import log
 from astropy.stats import sigma_clipped_stats
@@ -137,7 +135,7 @@ def _validate_settings(self, settings):
         """
 
         # Check the types and values
-        for key, value in six.iteritems(settings):
+        for key, value in settings.items():
             if key not in self._constraints or value is None:
                 message = ('Setting {} is not allowed. Display all of '
                            'the allowed settings with: '
@@ -284,7 +282,7 @@ def solve_from_source_list(self, x, y, image_width, image_height,
         For a list of the remaining settings, use the method
         `~AstrometryNetClass.show_allowed_settings`.
         """
-        settings = {k: v for k, v in six.iteritems(settings) if v is not None}
+        settings = {k: v for k, v in settings.items() if v is not None}
         self._validate_settings(settings)
         if self._session_id is None:
             self._login()
@@ -363,7 +361,7 @@ def solve_from_image(self, image_file_path, force_image_upload=False,
                 settings['center_ra'] = center.ra.degree
                 settings['center_dec'] = center.dec.degree
 
-        settings = {k: v for k, v in six.iteritems(settings) if v is not None}
+        settings = {k: v for k, v in settings.items() if v is not None}
         self._validate_settings(settings)
 
         if force_image_upload or self._no_source_detector:

astroquery/atomic/core.py

@@ -1,9 +1,7 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
-from six.moves.urllib import parse as urlparse
-from six.moves import map, zip
-from six import StringIO
-import six
+from io import StringIO
+from urllib import parse as urlparse
 
 from collections import defaultdict
 
@@ -292,7 +290,7 @@ def _submit_form(self, input=None, cache=True):
         # only overwrite payload's values if the `input` value is not None
         # to avoid overwriting of the form's default values
         payload = self._default_form_values.copy()
-        for k, v in six.iteritems(input):
+        for k, v in input.items():
             if v is not None:
                 payload[k] = v
         url = urlparse.urljoin(self.FORM_URL, self._default_form.get('action'))
@@ -346,7 +344,7 @@ def _get_default_form_values(self, form):
 
         # avoid values with size 1 lists
         d = dict(res)
-        for k, v in six.iteritems(d):
+        for k, v in d.items():
             if len(v) == 1:
                 d[k] = v[0]
         return d

astroquery/besancon/core.py

@@ -8,7 +8,7 @@
 import os
 import warnings
 from astropy.io import ascii
-from six.moves.urllib_error import URLError
+from urllib.error import URLError
 from collections import OrderedDict
 from ..query import BaseQuery
 from ..utils import commons, prepend_docstr_nosections, async_to_sync

astroquery/cosmosim/core.py

@@ -12,9 +12,9 @@
 import re
 import os
 import threading
-from six.moves.email_mime_multipart import MIMEMultipart
-from six.moves.email_mime_base import MIMEBase, message
-from six.moves.email_mime_text import MIMEText
+from email.mime.multipart import MIMEMultipart
+from email.mime.base import MIMEBase, message
+from email.mime.text import MIMEText
 
 # Astropy imports
 from astropy.table import Table

astroquery/esa/hubble/core.py

@@ -25,7 +25,7 @@
 from astroquery.utils.tap.model import modelutils
 from astroquery.query import BaseQuery
 from astropy.table import Table
-from six import BytesIO
+from io import BytesIO
 import shutil
 import os
 import json

astroquery/eso/core.py

@@ -11,8 +11,7 @@
 import re
 from bs4 import BeautifulSoup
 
-from six import BytesIO
-import six
+from io import BytesIO
 from astropy.table import Table, Column
 from astroquery import log
 
@@ -347,7 +346,7 @@ def query_surveys(self, surveys='', cache=True,
             survey_form = self._request("GET", url, cache=cache)
             query_dict = kwargs
             query_dict["wdbo"] = "csv/download"
-            if isinstance(surveys, six.string_types):
+            if isinstance(surveys, str):
                 surveys = surveys.split(",")
             query_dict['collection_name'] = surveys
             if self.ROW_LIMIT >= 0:
@@ -510,7 +509,7 @@ def get_headers(self, product_ids, cache=True):
 
         """
         _schema_product_ids = schema.Schema(
-            schema.Or(Column, [schema.Or(*six.string_types)]))
+            schema.Or(Column, [schema.Schema(str)]))
         _schema_product_ids.validate(product_ids)
         # Get all headers
         result = []
@@ -678,7 +677,7 @@ def retrieve_data(self, datasets, continuation=False, destination=None,
             raise ValueError("invalid value for 'with_calib', "
                              "it must be 'none', 'raw' or 'processed'")
 
-        if isinstance(datasets, six.string_types):
+        if isinstance(datasets, str):
             return_list = False
             datasets = [datasets]
         else:

astroquery/gaia/core.py

@@ -21,7 +21,6 @@
 from astroquery import log
 from astropy import units
 from astropy.units import Quantity
-import six
 import zipfile
 from astroquery.utils.tap import taputils
 from . import conf
@@ -250,7 +249,7 @@ def load_data(self, ids, data_release=None, data_structure='INDIVIDUAL', retriev
                                  "'G', 'BP' and 'RP)" % band)
             else:
                 params_dict['BAND'] = band
-        if isinstance(ids, six.string_types):
+        if isinstance(ids, str):
             ids_arg = ids
         else:
             if isinstance(ids, int):

astroquery/heasarc/core.py

@@ -1,7 +1,7 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
 import warnings
-from six import StringIO, BytesIO
+from io import StringIO, BytesIO
 from astropy.table import Table
 from astropy.io import fits
 from astropy import coordinates

astroquery/lamda/core.py

@@ -5,7 +5,7 @@
 from astroquery import log
 from astropy.utils.console import ProgressBar
 from bs4 import BeautifulSoup
-from six.moves import urllib_parse as urlparse
+from urllib import parse as urlparse
 import re
 import warnings