Merge pull request #2165 from eerovaher/rm-six

Remove `six`

Author: bsipocz

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/alma/tests/test_alma.py

@@ -1,9 +1,9 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
+from io import StringIO
 import os
 
 import pytest
 from unittest.mock import patch, Mock
-from six import StringIO
 
 from astropy import units as u
 from astropy import coordinates as coord

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/astrometry_net/tests/test_astrometry_net.py

@@ -4,7 +4,6 @@
 from distutils.version import LooseVersion
 
 import pytest
-import six
 
 from ...utils.testing_tools import MockResponse
 from ...exceptions import (InvalidQueryError)
@@ -87,7 +86,7 @@ def test_setting_validation_basic():
     anet = AstrometryNet()
     # This gets us a list of settings, their types, and restrictions.
     constraints = anet._constraints
-    for constraint, vals in six.iteritems(constraints):
+    for constraint, vals in constraints.items():
         if vals['type'] == str or vals['type'] == bool:
             settings = {constraint: 'asdiuhiuas'}
             with pytest.raises(ValueError) as e:

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/besancon/tests/test_besancon.py

@@ -4,7 +4,6 @@
 from contextlib import contextmanager
 import pytest
 from astropy.io.ascii.tests.common import assert_equal
-from six import string_types
 from ... import besancon
 from ...utils import commons
 from ...utils.testing_tools import MockResponse
@@ -65,7 +64,7 @@ def patch_post(request):
 def patch_get_readable_fileobj(request):
     @contextmanager
     def get_readable_fileobj_mockreturn(filename, **kwargs):
-        if isinstance(filename, string_types):
+        if isinstance(filename, str):
             if '1376235131.430670' in filename:
                 is_binary = kwargs.get('encoding', None) == 'binary'
                 file_obj = open(data_path('1376235131.430670.resu'),

astroquery/cadc/tests/test_cadctap.py

@@ -5,15 +5,15 @@
 =============
 
 """
+from io import BytesIO
+from urllib.parse import urlsplit, parse_qs
 import os
 import sys
 
 from astropy.table import Table as AstroTable
 from astropy.io.fits.hdu.hdulist import HDUList
 from astropy.io.votable.tree import VOTableFile, Resource, Table, Field
 from astropy.io.votable import parse
-from six import BytesIO
-from six.moves.urllib_parse import urlsplit, parse_qs
 from astroquery.utils.commons import parse_coordinates, FileContainer
 from astropy import units as u
 from astropy.utils.exceptions import AstropyDeprecationWarning

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