Skip to content

Commit 01c38d5

Browse files
“Javierbsipocz
authored andcommitted
JWSTPCR-254: remove copied code from TAP
1 parent 391f61c commit 01c38d5

File tree

3 files changed

+4
-34
lines changed

3 files changed

+4
-34
lines changed

astroquery/esa/jwst/core.py

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
from astropy.table import vstack
3030
from astropy.units import Quantity
3131

32-
from astroquery.esa.jwst.token import TokenDialog
3332
from astroquery.ipac.ned import Ned
3433
from astroquery.simbad import Simbad
3534
from astroquery.utils import commons
@@ -988,31 +987,6 @@ def login_gui(self, verbose=False):
988987
"""
989988
return self.__jwsttap.login_gui(verbose)
990989

991-
def login_token_gui(self, verbose=False):
992-
"""Performs a login using a GUI dialog
993-
TAP+ only, with an additiona field to
994-
specify a token
995-
996-
Parameters
997-
----------
998-
verbose : bool, optional, default 'False'
999-
flag to display information about the process
1000-
"""
1001-
connHandler = self.__jwsttap._TapPlus__getconnhandler()
1002-
url = connHandler.get_host_url()
1003-
loginDialog = TokenDialog(url)
1004-
loginDialog.show_login()
1005-
if loginDialog.is_accepted():
1006-
user = loginDialog.get_user()
1007-
pwd = loginDialog.get_password()
1008-
if loginDialog.get_token():
1009-
token = loginDialog.get_token()
1010-
self.login(user=user, password=pwd, token=token,
1011-
verbose=verbose)
1012-
else:
1013-
self.login(user=user, password=pwd, verbose=verbose)
1014-
# execute login
1015-
1016990
def logout(self, verbose=False):
1017991
"""Performs a logout
1018992
TAP+ only

docs/esa/jwst.rst

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ The main differences are:
640640

641641
* Asynchronous results are kept at server side for ever (until the user decides to remove one of them).
642642
* Users can access to shared tables.
643-
* ``login_token_gui`` allows the user to include a MAST token to download propietary data. It is also possible to set a token after logging using ``set_token`` function.
643+
* It is also possible to set a token after logging using ``set_token`` function.
644644

645645

646646
2.1. Login/Logout
@@ -656,12 +656,6 @@ Using the graphic interface:
656656
>>> from astroquery.esa.jwst import Jwst
657657
>>> Jwst.login_gui()
658658
659-
If the user wants to specify a MAST token to download propietary data:
660-
661-
.. code-block:: python
662-
663-
>>> from astroquery.esa.jwst import Jwst
664-
>>> Jwst.login_token_gui()
665659
666660
Using the command line:
667661

@@ -696,7 +690,7 @@ specified using the ``set_token`` function.
696690
>>> Jwst.login(user='userName', password='userPassword')
697691
>>> Jwst.set_token(token='mastToken')
698692
699-
To perform a logout
693+
To perform a logout:
700694

701695

702696
.. code-block:: python

docs/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ The following modules have been completed using a common API:
180180
cds/cds.rst
181181
esa/hubble.rst
182182
esa/iso.rst
183+
esa/jwst.rst
183184
esa/xmm_newton.rst
184185
esasky/esasky.rst
185186
eso/eso.rst
@@ -292,6 +293,7 @@ generally return a table listing the available data first.
292293
cadc/cadc.rst
293294
casda/casda.rst
294295
esa/hubble.rst
296+
esa/jwst.rst
295297
eso/eso.rst
296298
fermi/fermi.rst
297299
gaia/gaia.rst

0 commit comments

Comments
 (0)