solved pep8 issues after merge conflicts

Author: mhsarmiento

astroquery/esa/xmm_newton/core.py

@@ -20,27 +20,26 @@
 from pathlib import Path
 import tarfile
 import os
-from astroquery import log
-import configparser
 
 from astropy.io import fits
-from . import conf
+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")
@@ -49,7 +48,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, credentials_file=None, **kwargs):
+                      cache=True, prop=False, username=None, password=None, **kwargs):
         """
         Download data from XMM-Newton
 
@@ -64,13 +63,6 @@ def download_data(self, observation_id, *, filename=None, verbose=False,
         verbose : bool
             optional, default 'False'
             flag to display information about the process
-        prop: boolean
-            optional, default 'False'
-            flag to download proprietary data, the method will then ask the user to
-            input their username and password either manually or using the credentials_file
-        credentials_file: string
-            optional, default None
-            path to where the users config.ini file is stored with their username and password
         level : string
             level to download, optional, by default everything is downloaded
             values: ODF, PPS
@@ -113,7 +105,7 @@ def download_data(self, observation_id, *, filename=None, verbose=False,
         reveals the url being sent which in turn reveals the users username and password
         """
         previouslevel = log.getEffectiveLevel()
-        log.setLevel(21)
+        log.setLevel(50)
 
         # create url to access the aio
         link = self._create_link(observation_id, **kwargs)
@@ -130,6 +122,7 @@ def download_data(self, observation_id, *, filename=None, verbose=False,
         params = self._request_link(link, cache)
         r_filename = params["filename"]
         suffixes = Path(r_filename).suffixes
+        print(suffixes)
 
         # get desired filename
         filename = self._create_filename(filename, observation_id, suffixes)
@@ -306,7 +299,7 @@ def _request_link(self, link, cache):
         return params
 
     def _get_username_and_password(self, credentials_file):
-        if credentials_file != None:
+        if credentials_file is not None:
             self.configuration.read(credentials_file)
             username = self.configuration.get('user', 'username')
             password = self.configuration.get('user', 'password')

astroquery/esa/xmm_newton/tests/test_xmm_newton.py

@@ -560,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

@@ -21,6 +21,7 @@
 from ..core import XMMNewtonClass
 from ..tests.dummy_tap_handler import DummyXMMNewtonTapHandler
 
+
 class TestXMMNewtonRemote():
     _files = {
         "0405320501": {
@@ -78,15 +79,15 @@ class TestXMMNewtonRemote():
                 "P0405320501PNS001IMAGE_5000.FTZ",
                 "P0405320501PNU001IMAGE_5000.FTZ",
                 "P0405320501PNX001IMAGE_5000.FTZ"
-                ]
-            }
+            ]
+        }
     }
 
     def get_dummy_tap_handler(self):
         parameters = {'query': "select top 10 * from v_public_observations",
-                       'output_file': "test2.vot",
-                       'output_format': "votable",
-                       'verbose': False}
+                      'output_file': "test2.vot",
+                      'output_format': "votable",
+                      'verbose': False}
         dummyTapHandler = DummyXMMNewtonTapHandler("launch_job", parameters)
         return dummyTapHandler
 
@@ -99,7 +100,7 @@ def _create_tar(self, tarname, files):
                             os.makedirs(os.path.join(ob_name, ftype))
                         except OSError as exc:
                             if exc.errno == errno.EEXIST and \
-                              os.path.isdir(os.path.join(ob_name, ftype)):
+                                    os.path.isdir(os.path.join(ob_name, ftype)):
                                 pass
                             else:
                                 raise
@@ -164,7 +165,7 @@ def test_get_epic_metadata(self):
         slew_source_column = "slew_source_cat_equatorial_spoint"
         xsa = XMMNewtonClass(TapPlus(url=tap_url))
         epic_source, cat_4xmm, stack_4xmm, slew_source = xsa.get_epic_metadata(target_name=target_name,
-                                                                                radius=radius)
+                                                                               radius=radius)
         c = SkyCoord.from_name(target_name, parse=True)
         query = ("select * from {} "
                  "where 1=contains({}, circle('ICRS', {}, {}, {}));")
@@ -221,7 +222,6 @@ def test_download_proprietary_data_without_credentials(self):
         xsa = XMMNewtonClass(self.get_dummy_tap_handler())
         xsa.download_data(**parameters)
 
-
     @pytest.mark.remote_data
     def test_get_epic_spectra(self):
         _tarname = "tarfile.tar"
@@ -233,4 +233,4 @@ def test_get_epic_spectra(self):
         xsa = XMMNewtonClass(self.get_dummy_tap_handler())
         res = xsa.get_epic_spectra(_tarname, _source_number,
                                    instrument=[])
-        assert len(res) == 0
+        assert len(res) == 0