NXSA-1091: Added missing lines of code

Author: javier-ballester

astroquery/esa/xmm_newton/core.py

@@ -24,7 +24,7 @@
 import configparser
 
 from astropy.io import fits
-from . import conf, config
+from . import conf
 from astroquery import log
 from astropy.coordinates import SkyCoord
 from ...exceptions import LoginError
@@ -114,11 +114,7 @@ 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)
@@ -135,11 +131,7 @@ 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",
@@ -286,11 +278,7 @@ 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

@@ -1,19 +1,12 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """
-
 @author: Elena Colomo
 @contact: [email protected]
-
 European Space Astronomy Centre (ESAC)
 European Space Agency (ESA)
-
 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
@@ -27,11 +20,7 @@
 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"',
@@ -42,13 +31,8 @@ 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",
@@ -543,7 +527,6 @@ 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):
@@ -563,8 +546,6 @@ 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")
@@ -579,4 +560,4 @@ def test_create_filename_None(self):
     def test_create_filename_Not_None(self):
         xsa = XMMNewtonClass(self.get_dummy_tap_handler())
         filename = xsa._create_filename("Test", "0560181401", ['.tar', '.gz'])
-        assert filename == "Test.tar.gz"
+        assert filename == "Test.tar.gz"

astroquery/esa/xmm_newton/tests/test_xmm_newton_remote.py

@@ -199,7 +199,6 @@ 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',
@@ -213,8 +212,6 @@ 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',