Skip to content

fix(cadcclient): improve handling of stdout #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tjzegmott merged 1 commit into from
Feb 19, 2026
Merged

fix(cadcclient): improve handling of stdout #136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 34 additions & 28 deletions dtcli/utilities/cadcclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,20 +291,23 @@ def dataset_md5s(
query = query.replace("//", "/")
logger.info(f"Running query: {query}")
buffer = StringIO()
sys.stdout = buffer
_, _, queryClient = _connect()
queryClient.query( # type: ignore
query=query,
output_file=None,
response_format="csv",
tmptable=None,
lang="ADQL",
timeout=timeout,
data_only=True,
no_column_names=True,
)
content = buffer.getvalue()
sys.stdout = sys.__stdout__
original_stdout = sys.stdout
try:
sys.stdout = buffer
_, _, queryClient = _connect()
queryClient.query( # type: ignore
query=query,
output_file=None,
response_format="csv",
tmptable=None,
lang="ADQL",
timeout=timeout,
data_only=True,
no_column_names=True,
)
content = buffer.getvalue()
finally:
sys.stdout = original_stdout
paths = []
md5s = []
for line in content.split("\n"):
Expand Down Expand Up @@ -354,20 +357,23 @@ def query(
query = query.replace("//", "/")
logger.info(f"Running query: {query}")
buffer = StringIO()
sys.stdout = buffer
_, _, queryClient = _connect()
queryClient.query( # type: ignore
query=query,
output_file=None,
response_format="csv",
tmptable=None,
lang="ADQL",
timeout=timeout,
data_only=True,
no_column_names=True,
)
content = buffer.getvalue()
sys.stdout = sys.__stdout__
original_stdout = sys.stdout
try:
sys.stdout = buffer
_, _, queryClient = _connect()
queryClient.query( # type: ignore
query=query,
output_file=None,
response_format="csv",
tmptable=None,
lang="ADQL",
timeout=timeout,
data_only=True,
no_column_names=True,
)
content = buffer.getvalue()
finally:
sys.stdout = original_stdout
return [line.split(",") for line in content.split("\n")]


Expand Down