Fixup sdss import order; fix error type

Author: jdavies-st

astroquery/hips2fits/tests/test_hips2fits_remote.py

@@ -83,7 +83,7 @@ def test_query_jpg_no_wcs(self):
         assert isinstance(result, np.ndarray) and result.shape[2] == 3
 
     def test_bad_strech(self):
-        with pytest.raises(AstropyUserWarning, match=r"stretch: must either"):
+        with pytest.raises(AttributeError, match=r"Unknown value azs for stretch parameter"):
             hips2fits.query_with_wcs(
                 hips=self.hips,
                 wcs=self.w,

astroquery/sdss/__init__.py

@@ -5,8 +5,6 @@
 """
 from astropy import config as _config
 
-from .core import SDSS, SDSSClass
-
 
 class Conf(_config.ConfigNamespace):
     """
@@ -27,4 +25,7 @@ class Conf(_config.ConfigNamespace):
 conf = Conf()
 
 
+from .core import SDSS, SDSSClass
+
+
 __all__ = ["SDSS", "SDSSClass", conf]