NXSAPCR-1091: Added remaining functionality to the branch

Author: javier-ballester

astroquery/esa/xmm_newton/core.py

@@ -20,26 +20,27 @@
 from pathlib import Path
 import tarfile
 import os
+from astroquery import log
+import configparser
 
 from astropy.io import fits
 from . import conf, config
 from astroquery import log
 from astropy.coordinates import SkyCoord
 from ...exceptions import LoginError
 
-
 __all__ = ['XMMNewton', 'XMMNewtonClass']
 
 
 class XMMNewtonClass(BaseQuery):
-
     data_url = conf.DATA_ACTION
     data_aio_url = conf.DATA_ACTION_AIO
     metadata_url = conf.METADATA_ACTION
     TIMEOUT = conf.TIMEOUT
 
     def __init__(self, tap_handler=None):
         super(XMMNewtonClass, self).__init__()
+        self.configuration = configparser.ConfigParser()
 
         if tap_handler is None:
             self._tap = TapPlus(url="https://nxsa.esac.esa.int/tap-server/tap")
@@ -48,7 +49,7 @@ def __init__(self, tap_handler=None):
         self._rmf_ftp = str("http://sasdev-xmm.esac.esa.int/pub/ccf/constituents/extras/responses/")
 
     def download_data(self, observation_id, *, filename=None, verbose=False,
-                      cache=True, prop=False, username=None, password=None, **kwargs):
+                      cache=True, prop=False, credentials_file=None, **kwargs):
         """
         Download data from XMM-Newton
 
@@ -113,7 +114,11 @@ def download_data(self, observation_id, *, filename=None, verbose=False,
         # If the user wants to access proprietary data, ask them for there credentials
         if prop:
             username, password = self._get_username_and_password(credentials_file)
+<<<<<<< HEAD
             link = f"{link}&AIOUSER={username}&AIOPWD={password}"
+=======
+            link = link + "&AIOUSER=" + username + "&AIOPWD=" + password
+>>>>>>> 40576ad4 (xmm_newton-1.1_issue1093 Refactored the download data method and added the corresponding tests)
 
         if verbose:
             log.info(link)
@@ -130,7 +135,11 @@ def download_data(self, observation_id, *, filename=None, verbose=False,
         self._download_file(link, filename, head_safe=True, cache=cache)
 
         if verbose:
+<<<<<<< HEAD
             log.info(f"Wrote {link} to {filename}")
+=======
+            log.info("Wrote {0} to {1}".format(link, filename))
+>>>>>>> 40576ad4 (xmm_newton-1.1_issue1093 Refactored the download data method and added the corresponding tests)
         log.setLevel(previouslevel)
 
     def get_postcard(self, observation_id, *, image_type="OBS_EPIC",
@@ -277,7 +286,11 @@ def get_columns(self, table_name, *, only_names=True, verbose=False):
             return columns
 
     def _create_link(self, observation_id, **kwargs):
+<<<<<<< HEAD
         link = f"{self.data_aio_url}obsno={observation_id}"
+=======
+        link = self.data_aio_url + "obsno=" + observation_id
+>>>>>>> 40576ad4 (xmm_newton-1.1_issue1093 Refactored the download data method and added the corresponding tests)
         link = link + "".join("&{0}={1}".format(key, val)
                               for key, val in kwargs.items())
         return link

astroquery/esa/xmm_newton/tests/test_xmm_newton.py

@@ -9,7 +9,11 @@
 
 Created on 4 Sept. 2019
 """
+<<<<<<< HEAD
 from unittest.mock import patch
+=======
+from unittest.mock import patch, MagicMock
+>>>>>>> 40576ad4 (xmm_newton-1.1_issue1093 Refactored the download data method and added the corresponding tests)
 
 import pytest
 import tarfile
@@ -23,7 +27,11 @@
 from astroquery.exceptions import LoginError
 
 
+<<<<<<< HEAD
 class mockResponse():
+=======
+class mockResponse:
+>>>>>>> 40576ad4 (xmm_newton-1.1_issue1093 Refactored the download data method and added the corresponding tests)
     headers = {'Date': 'Wed, 24 Nov 2021 13:43:50 GMT',
                'Server': 'Apache/2.4.6 (Red Hat Enterprise Linux) OpenSSL/1.0.2k-fips',
                'Content-Disposition': 'inline; filename="0560181401.tar.gz"',
@@ -34,8 +42,13 @@ class mockResponse():
     @staticmethod
     def raise_for_status():
         pass
+<<<<<<< HEAD
 
 
+=======
+
+
+>>>>>>> 40576ad4 (xmm_newton-1.1_issue1093 Refactored the download data method and added the corresponding tests)
 class TestXMMNewton():
     def get_dummy_tap_handler(self):
         parameters = {'query': "select top 10 * from v_public_observations",
@@ -530,6 +543,7 @@ def test_request_link(self, mock_request):
         params = xsa._request_link("https://nxsa.esac.esa.int/nxsa-sl/servlet/data-action-aio?obsno=0560181401", None)
         assert params == {'filename': '0560181401.tar.gz'}
 
+<<<<<<< HEAD
     @pytest.mark.xfail(raises=LoginError)
     @patch('astroquery.query.BaseQuery._request')
     def test_request_link_protected(self, mock_request):
@@ -549,6 +563,8 @@ def test_request_link_incorrect_credentials(self, mock_request):
         mock_request.return_value = dummyclass
         xsa._request_link("https://nxsa.esac.esa.int/nxsa-sl/servlet/data-action-aio?obsno=0560181401", None)
 
+=======
+>>>>>>> 40576ad4 (xmm_newton-1.1_issue1093 Refactored the download data method and added the corresponding tests)
     def test_get_username_and_password(self):
         xsa = XMMNewtonClass(self.get_dummy_tap_handler())
         username, password = xsa._get_username_and_password("astroquery/esa/xmm_newton/tests/my_config.ini")

astroquery/esa/xmm_newton/tests/test_xmm_newton_remote.py

@@ -199,6 +199,7 @@ def test_download_proprietary_data_incorrect_credentials(self):
         parameters = {'observation_id': "0762470101",
                       'prop': 'True',
                       'credentials_file': "astroquery/esa/xmm_newton/tests/my_config.ini",
+<<<<<<< HEAD
                       'level': "PPS",
                       'name': 'OBSMLI',
                       'filename': 'single',
@@ -212,6 +213,8 @@ def test_download_proprietary_data_incorrect_credentials(self):
     @pytest.mark.xfail(raises=LoginError)
     def test_download_proprietary_data_without_credentials(self):
         parameters = {'observation_id': "0883780101",
+=======
+>>>>>>> 40576ad4 (xmm_newton-1.1_issue1093 Refactored the download data method and added the corresponding tests)
                       'level': "PPS",
                       'name': 'OBSMLI',
                       'filename': 'single',