Skip to content

Commit

Permalink
Merge pull request #2085 from jpl-jengelke/patch-1
Browse files Browse the repository at this point in the history
Issue #1722: Turn off verbose Tap Plus messages
  • Loading branch information
bsipocz authored Jun 20, 2021
2 parents 8c57476 + 89a39b9 commit 6dd5b67
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ esa.xmm_newton

- Bug fixes. Fixed the generation of files with wrong extension. [#2017]

gaia
^^^^

- Bug fixes. Changed default behavior of Gaia TAP Plus interface to instantiate silently. [#1722]

heasarc
^^^^^^^

Expand Down
9 changes: 6 additions & 3 deletions astroquery/gaia/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,17 @@ def __init__(self, tap_plus_conn_handler=None,
gaia_tap_server='https://gea.esac.esa.int/',
gaia_data_server='https://gea.esac.esa.int/',
tap_server_context="tap-server",
data_server_context="data-server"):
data_server_context="data-server",
verbose=False):
super(GaiaClass, self).__init__(url=gaia_tap_server,
server_context=tap_server_context,
tap_context="tap",
upload_context="Upload",
table_edit_context="TableTool",
data_context="data",
datalink_context="datalink",
connhandler=tap_plus_conn_handler)
connhandler=tap_plus_conn_handler,
verbose=verbose)
# Data uses a different TapPlus connection
if datalink_handler is None:
self.__gaiadata = TapPlus(url=gaia_data_server,
Expand All @@ -67,7 +69,8 @@ def __init__(self, tap_plus_conn_handler=None,
upload_context="Upload",
table_edit_context="TableTool",
data_context="data",
datalink_context="datalink")
datalink_context="datalink",
verbose=verbose)
else:
self.__gaiadata = datalink_handler

Expand Down

0 comments on commit 6dd5b67

Please sign in to comment.