Remove six from tests

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 the tests.

Author: eerovaher

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/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/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/eso/tests/test_eso_remote.py

@@ -3,7 +3,6 @@
 import pytest
 import tempfile
 import shutil
-import six
 from ...exceptions import LoginError
 
 from ...eso import Eso
@@ -126,10 +125,10 @@ def test_retrieve_data(self):
         assert len(result) > 0
         assert "MIDI.2014-07-25T02:03:11.561" in result[0]
         result = eso.retrieve_data("MIDI.2014-07-25T02:03:11.561")
-        assert isinstance(result, six.string_types)
+        assert isinstance(result, str)
         result = eso.retrieve_data("MIDI.2014-07-25T02:03:11.561",
                                    request_all_objects=True)
-        assert isinstance(result, six.string_types)
+        assert isinstance(result, str)
 
     @pytest.mark.skipif('not Eso.USERNAME')
     def test_retrieve_data_twice(self):

astroquery/gaia/tests/DummyTapHandler.py

@@ -14,7 +14,7 @@
 
 
 """
-from six.moves.urllib.parse import urlencode
+from urllib.parse import urlencode
 
 CONTENT_TYPE_POST_DEFAULT = "application/x-www-form-urlencoded"
 

astroquery/nist/tests/test_nist_remote.py

@@ -5,7 +5,6 @@
 
 from astropy.table import Table
 import astropy.units as u
-from six import PY2  # noqa
 
 import pytest
 
@@ -27,7 +26,6 @@ def test_query(self):
         # (regression test for 1355)
         assert np.all(result['TP'] == 'T8637')
 
-    @pytest.mark.skipif('PY2')
     def test_unescape_html(self):
         response = nist.core.Nist.query_async(4333 * u.AA, 4334 * u.AA, "V I")
         assert '†' in response.text

astroquery/sdss/tests/test_sdss.py

@@ -1,11 +1,11 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 from contextlib import contextmanager
+from urllib.error import URLError
 import os
 import socket
 import numpy as np
 from numpy.testing import assert_allclose
 
-import six
 from astropy.io import fits
 from astropy.table import Column, Table
 import pytest
@@ -78,7 +78,7 @@ def get_readable_fileobj_mockreturn(filename, **kwargs):
 def patch_get_readable_fileobj_slow(request):
     @contextmanager
     def get_readable_fileobj_mockreturn(filename, **kwargs):
-        error = six.moves.urllib_error.URLError('timeout')
+        error = URLError('timeout')
         error.reason = socket.timeout()
         raise error
         yield True

astroquery/sdss/tests/test_sdss_remote.py

@@ -6,7 +6,7 @@
 from astropy import coordinates
 from astropy.table import Table
 
-from six.moves.urllib_error import URLError
+from urllib.error import URLError
 
 from ... import sdss
 from ...exceptions import TimeoutError

astroquery/simbad/tests/test_simbad.py

@@ -2,7 +2,6 @@
 import os
 import re
 
-import six
 import pytest
 import astropy.units as u
 from astropy.table import Table
@@ -131,8 +130,8 @@ def test_parse_result():
                              'The attempted parsed result is in '
                              'self.last_parsed_result.\n Exception: 7:115: '
                              'no element found')
-    assert isinstance(simbad.Simbad.last_response.text, six.string_types)
-    assert isinstance(simbad.Simbad.last_response.content, six.binary_type)
+    assert isinstance(simbad.Simbad.last_response.text, str)
+    assert isinstance(simbad.Simbad.last_response.content, bytes)
 
 
 votable_fields = ",".join(simbad.core.Simbad.get_votable_fields())