Used _get_password as suggested and changed config file as suggested by astroquery team

Author: javier-ballester

astroquery/esa/xmm_newton/core.py

@@ -14,13 +14,12 @@
 import re
 from getpass import getpass
 from ...utils.tap.core import TapPlus
-from ...query import BaseQuery
+from ...query import BaseQuery, QueryWithLogin
 import shutil
 import cgi
 from pathlib import Path
 import tarfile
 import os
-from astroquery import log
 import configparser
 
 from astropy.io import fits
@@ -111,7 +110,7 @@ def download_data(self, observation_id, *, filename=None, verbose=False,
         # create url to access the aio
         link = self._create_link(observation_id, **kwargs)
 
-        # If the user wants to access proprietary data, ask them for there credentials
+        # If the user wants to access proprietary data, ask them for their credentials
         if prop:
             username, password = self._get_username_and_password(credentials_file)
             link = f"{link}&AIOUSER={username}&AIOPWD={password}"
@@ -309,12 +308,13 @@ def _request_link(self, link, cache):
     def _get_username_and_password(self, credentials_file):
         if credentials_file is not None:
             self.configuration.read(credentials_file)
-            username = self.configuration.get('user', 'username')
-            password = self.configuration.get('user', 'password')
+            xmm_username = self.configuration.get("xmm_newton", "username")
+            password = self.configuration.get("xmm_newton", "password")
         else:
-            username = input("Username: ")
-            password = getpass("Password: ")
-        return username, password
+            xmm_username = input("Username: ")
+            password, password_from_keyring = QueryWithLogin._get_password(self, service_name="xmm_newton",
+                                                                           username=xmm_username, reenter=False)
+        return xmm_username, password
 
     def _create_filename(self, filename, observation_id, suffixes):
         if filename is not None:
@@ -615,9 +615,9 @@ def get_epic_metadata(self, *, target_name=None,
             Tables containing the metadata of the target
         """
         if not target_name and not coordinates:
-            raise Exception("Input parameters needed, "
-                            "please provide the name "
-                            "or the coordinates of the target")
+            raise ValueError("Input parameters needed, "
+                             "please provide the name "
+                             "or the coordinates of the target")
 
         epic_source = {"table": "xsa.v_epic_source",
                        "column": "epic_source_equatorial_spoint"}
@@ -635,7 +635,7 @@ def get_epic_metadata(self, *, target_name=None,
             c = SkyCoord.from_name(target_name, parse=True)
 
         if type(c) is not SkyCoord:
-            raise Exception("The coordinates must be an "
+            raise TypeError("The coordinates must be an "
                             "astroquery.coordinates.SkyCoord object")
         if not radius:
             radius = 0.1

astroquery/esa/xmm_newton/tests/data/my_config.ini renamed to astroquery/esa/xmm_newton/tests/data/dummy_config.ini

@@ -1,3 +1,3 @@
-[user]
+[xmm_newton]
 username=test
 password=test

astroquery/esa/xmm_newton/tests/test_xmm_newton.py

@@ -553,7 +553,7 @@ def test_request_link_incorrect_credentials(self, mock_request):
 
     def test_get_username_and_password(self):
         xsa = XMMNewtonClass(self.get_dummy_tap_handler())
-        file = data_path("my_config.ini")
+        file = data_path("dummy_config.ini")
         username, password = xsa._get_username_and_password(file)
         assert username == "test"
         assert password == "test"

astroquery/esa/xmm_newton/tests/test_xmm_newton_remote.py

@@ -199,7 +199,7 @@ def test_get_epic_metadata(self):
     def test_download_proprietary_data_incorrect_credentials(self):
         parameters = {'observation_id': "0762470101",
                       'prop': 'True',
-                      'credentials_file': "astroquery/esa/xmm_newton/tests/my_config.ini",
+                      'credentials_file': "astroquery/esa/xmm_newton/tests/data/dummy_config.ini",
                       'level': "PPS",
                       'name': 'OBSMLI',
                       'filename': 'single',

docs/esa/xmm_newton.rst

@@ -41,16 +41,14 @@ For more details of the parameters check the section 3.4 at:
 --------------------------------------
 To access proprietary data an extra variable is needed in the XMMNewton.download_data method. This variabe is prop which
 can be True or False. If True a username and password is needed. A username and password can be passed by adding another
-variable to the XMMNewton.download_data method called credentials_file. This variable is a string with the path to a
-config.ini file with the desired username and password, e.g. credentials_file = "users/joe.bloggs/config.ini"
-
-Example config.ini file,
+variable to the XMMNewton.download_data method called credentials_file. This variable is a string with the path to
+~/.astropy/config/astroquery.cfg file. Inside this file add your desired username and password, e.g.
 
 .. code-block::
 
-    [user]
-    username = test
-    password = test
+    [xmm_newton]
+    username = your_username
+    password = your_password
 
 If the credentials_file variable is not provided the method will ask for the username and password to be added manually
 from the commandline