Adding missing import, fix grammar

Author: bsipocz

astroquery/cds/__init__.py

@@ -21,11 +21,12 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 import warnings
 
-warnings.warn("The ``cds`` module has been moved to astroquery.mocserver,"
-              "and ``CdsClass`` has been renamed ``MOCServerClass``. "
+warnings.warn("The ``cds`` module has been moved to astroquery.mocserver, "
+              "and ``CdsClass`` has been renamed to ``MOCServerClass``. "
               "Please update your imports.", DeprecationWarning, stacklevel=2)
 
 from astroquery.mocserver import MOCServer as cds
 from astroquery.mocserver import MOCServerClass as CdsClass
+from astroquery.mocserver import conf, Conf
 
 __all__ = ['conf', 'Conf', 'cds', 'CdsClass']

astroquery/mocserver/tests/test_deprecation.py

@@ -4,7 +4,7 @@
 def test_raises_deprecation_warning():
     with pytest.raises(
         DeprecationWarning,
-        match="The ``cds`` module has been moved to astroquery.mocserver,"
-              "and ``CdsClass`` has been renamed ``MOCServerClass``. "
+        match="The ``cds`` module has been moved to astroquery.mocserver, "
+              "and ``CdsClass`` has been renamed to ``MOCServerClass``. "
               "Please update your imports."):
         from astroquery.cds import cds  # noqa: F401