Remove password parameter

Author: jd-au

astroquery/casda/core.py

@@ -50,11 +50,11 @@ class CasdaClass(QueryWithLogin):
     _login_url = conf.login_url
     _uws_ns = {'uws': 'http://www.ivoa.net/xml/UWS/v1.0'}
 
-    def __init__(self, user=None, password=None):
+    def __init__(self):
         super().__init__()
 
     def _login(self, *, username=None, store_password=False,
-               reenter_password=False, password=None):
+               reenter_password=False):
         """
         login to non-public data as a known user
 
@@ -69,8 +69,6 @@ def _login(self, *, username=None, store_password=False,
             Asks for the password even if it is already stored in the
             keyring. This is the way to overwrite an already stored passwork
             on the keyring. Default is False.
-        password : str, optional
-            Password for the CASDA archive. If not given, it will obtained either from the keyring or interactively.
         """
 
         if username is None:
@@ -80,14 +78,9 @@ def _login(self, *, username=None, store_password=False,
             else:
                 username = self.USERNAME
 
-        if password is None:
-            # Get password from keyring or prompt
-            password, password_from_keyring = self._get_password(
-                "astroquery:casda.csiro.au", username, reenter=reenter_password)
-        else:
-            # Bypass the keyring if a password is supplied
-            password_from_keyring = None
-            store_password = False
+        # Get password from keyring or prompt
+        password, password_from_keyring = self._get_password(
+            "astroquery:casda.csiro.au", username, reenter=reenter_password)
 
         # Login to CASDA to test credentals
         log.info("Authenticating {0} on CASDA ...".format(username))

astroquery/casda/tests/test_casda.py

@@ -125,37 +125,10 @@ def isclose(value1, value2, abs_tol=1e-09):
     return abs(value1 - value2) < abs_tol
 
 
-def test_login(patch_get):
-    casda = Casda()
-    assert casda._authenticated is False
-    assert casda.USERNAME == ''
-
-    casda.login(username=USERNAME, password=PASSWORD)
-    assert casda._authenticated is True
-    assert casda.USERNAME == USERNAME
-    assert casda._auth == (USERNAME, 'password')
-
-
-def test_login_badpassword(patch_get):
-    casda = Casda()
-    assert casda._authenticated is False
-    assert casda.USERNAME == ''
-
-    casda.login(username=USERNAME, password='notthepassword')
-    assert casda._authenticated is False
-    assert casda.USERNAME == ''
-    assert hasattr(casda, '_auth') is False
-
-
-def test_login_default_user(patch_get):
-    casda = Casda()
-    casda.USERNAME = USERNAME
-    assert casda._authenticated is False
-
-    casda.login(password=PASSWORD)
-    assert casda._authenticated is True
-    assert casda.USERNAME == USERNAME
-    assert casda._auth == (USERNAME, 'password')
+def fake_login(casda, username, password):
+    casda.USERNAME = username
+    casda._auth = (username, password)
+    casda._authenticated = True
 
 
 def test_login_no_default_user():
@@ -322,7 +295,7 @@ def test_stage_data_unauthorised(patch_get):
 def test_stage_data_empty(patch_get):
     table = Table()
     casda = Casda()
-    casda.login(username=USERNAME, password=PASSWORD)
+    fake_login(casda, USERNAME, PASSWORD)
     urls = casda.stage_data(table)
     assert urls == []
 
@@ -347,7 +320,7 @@ def test_stage_data_no_link(patch_get):
     access_urls = [prefix + 'cube-240']
     table = Table([Column(data=access_urls, name='access_url')])
     casda = Casda()
-    casda.login(username=USERNAME, password=PASSWORD)
+    fake_login(casda, USERNAME, PASSWORD)
     casda.POLL_INTERVAL = 1
 
     with pytest.raises(ValueError) as excinfo:
@@ -361,7 +334,7 @@ def test_stage_data(patch_get):
     access_urls = [prefix + 'cube-244']
     table = Table([Column(data=access_urls, name='access_url')])
     casda = Casda()
-    casda.login(username=USERNAME, password=PASSWORD)
+    fake_login(casda, USERNAME, PASSWORD)
     casda.POLL_INTERVAL = 1
     urls = casda.stage_data(table, verbose=True)
     assert urls == ['http://casda.csiro.au/download/web/111-000-111-000/askap_img.fits.checksum',
@@ -378,7 +351,7 @@ def test_cutout(patch_get):
     centre = SkyCoord(ra, dec)
 
     casda = Casda()
-    casda.login(username=USERNAME, password=PASSWORD)
+    fake_login(casda, USERNAME, PASSWORD)
     casda.POLL_INTERVAL = 1
     urls = casda.cutout(table, coordinates=centre, radius=radius, verbose=True)
     assert urls == ['http://casda.csiro.au/download/web/111-000-111-000/cutout.fits.checksum',
@@ -395,7 +368,7 @@ def test_cutout_no_args(patch_get):
     centre = SkyCoord(ra, dec)
 
     casda = Casda()
-    casda.login(username=USERNAME, password=PASSWORD)
+    fake_login(casda, USERNAME, PASSWORD)
     casda.POLL_INTERVAL = 1
     with pytest.raises(ValueError) as excinfo:
         casda.cutout(table)
@@ -418,7 +391,7 @@ def test_cutout_unauthorised(patch_get):
 
 def test_cutout_no_table(patch_get):
     casda = Casda()
-    casda.login(username=USERNAME, password=PASSWORD)
+    fake_login(casda, USERNAME, PASSWORD)
 
     casda.POLL_INTERVAL = 1
     result = casda.cutout(None)
@@ -427,7 +400,7 @@ def test_cutout_no_table(patch_get):
 
 def test_args_to_payload_band(patch_get):
     casda = Casda()
-    casda.login(username=USERNAME, password=PASSWORD)
+    fake_login(casda, USERNAME, PASSWORD)
 
     payload = casda._args_to_payload(band=(0.195*u.m, 0.215*u.m))
     assert payload['BAND'] == '0.195 0.215'
@@ -468,7 +441,7 @@ def test_args_to_payload_band(patch_get):
 
 def test_args_to_payload_band_invalid(patch_get):
     casda = Casda()
-    casda.login(username=USERNAME, password=PASSWORD)
+    fake_login(casda, USERNAME, PASSWORD)
 
     with pytest.raises(ValueError) as excinfo:
         casda._args_to_payload(band='foo')
@@ -497,7 +470,7 @@ def test_args_to_payload_band_invalid(patch_get):
 
 def test_args_to_payload_channel(patch_get):
     casda = Casda()
-    casda.login(username=USERNAME, password=PASSWORD)
+    fake_login(casda, USERNAME, PASSWORD)
 
     payload = casda._args_to_payload(channel=(0, 30))
     assert payload['CHANNEL'] == '0 30'
@@ -514,7 +487,7 @@ def test_args_to_payload_channel(patch_get):
 
 def test_args_to_payload_channel_invalid(patch_get):
     casda = Casda()
-    casda.login(username=USERNAME, password=PASSWORD)
+    fake_login(casda, USERNAME, PASSWORD)
 
     with pytest.raises(ValueError) as excinfo:
         casda._args_to_payload(channel='one')
@@ -535,7 +508,7 @@ def test_args_to_payload_channel_invalid(patch_get):
 
 def test_args_to_payload_coordinates(patch_get):
     casda = Casda()
-    casda.login(username=USERNAME, password=PASSWORD)
+    fake_login(casda, USERNAME, PASSWORD)
 
     cutout_coords = SkyCoord(ra=345.245*u.degree, dec=-32.125*u.degree, frame='icrs')
     payload = casda._args_to_payload(coordinates=cutout_coords)
@@ -574,7 +547,7 @@ def test_args_to_payload_coordinates(patch_get):
 
 def test_args_to_payload_combined(patch_get):
     casda = Casda()
-    casda.login(username=USERNAME, password=PASSWORD)
+    fake_login(casda, USERNAME, PASSWORD)
     cutout_coords = SkyCoord(ra=187.5*u.degree, dec=-60.0*u.degree, frame='icrs')
     payload = casda._args_to_payload(coordinates=cutout_coords, channel=(17, 23))
     assert payload['POS'].startswith('CIRCLE 187')
@@ -593,7 +566,7 @@ def test_download_file(patch_get):
             'http://casda.csiro.au/download/web/111-000-111-000/askap_img.fits.checksum',
             'https://ingest.pawsey.org.au/casda-prd-as110-01/dc52217/primary_images/RACS-DR1_0000%2B18A.fits?security=stuff']
     casda = Casda()
-    casda.login(username=USERNAME, password=PASSWORD)
+    fake_login(casda, USERNAME, PASSWORD)
 
     # skip the actual downloading of the file
     download_mock = MagicMock()

astroquery/casda/tests/test_casda_remote.py

@@ -65,16 +65,15 @@ def test_stage_data(self, cached_credentials):
         assert str(urls[1]).endswith('image_cube_g300to310.q.fits.checksum')
         assert len(urls) == 2
 
-    @pytest.mark.skipif(('CASDA_USER' not in os.environ or
-                        'CASDA_PASSWD' not in os.environ),
+    @pytest.mark.skipif(('CASDA_USER' not in os.environ),
                         reason='Requires real CASDA user/password (CASDA_USER '
-                               'and CASDA_PASSWD environment variables)')
-    def test_cutout(self):
+                               'and CASDA_PASSWD environment variables or password in keyring)')
+    def test_cutout(self, cached_credentials):
         prefix = 'https://data.csiro.au/casda_vo_proxy/vo/datalink/links?ID='
         access_urls = [prefix + 'cube-44705']
         table = Table([Column(data=access_urls, name='access_url')])
         casda = Casda()
-        casda.login(username=os.environ['CASDA_USER'], password=os.environ['CASDA_PASSWD'])
+        casda.login(username=os.environ['CASDA_USER'])
         casda.POLL_INTERVAL = 3
         pos = SkyCoord(196.49583333*u.deg, -62.7*u.deg)
         urls = casda.cutout(table, coordinates=pos, radius=15*u.arcmin)