Replace print with log where necessary

Author: daisycodes

astroquery/eso/core.py

@@ -781,7 +781,7 @@ def retrieve_data(self, datasets, continuation=False, destination=None,
                     root = BeautifulSoup(data_download_form.content,
                                          'html5lib')
                     state = root.select('span[id=requestState]')[0].text
-                    print("{0:20.0f}s elapsed"
+                    log.info("{0:20.0f}s elapsed"
                           .format(time.time() - t0), end='\r')
                     sys.stdout.flush()
                 if state == 'ERROR':
@@ -1004,7 +1004,7 @@ def _print_query_help(self, url, cache=True):
                     result_string.append("{0} {1}: {2}"
                                          .format(checkbox, name, value))
 
-        print("\n".join(result_string))
+        log.info("\n".join(result_string))
         return result_string
 
     def _print_surveys_help(self, url, cache=True):
@@ -1081,7 +1081,7 @@ def _print_surveys_help(self, url, cache=True):
                         if name.strip() in helptext_dict:
                             result_string.append(helptext_dict[name.strip()])
 
-        print("\n".join(result_string))
+        log.info("\n".join(result_string))
         return result_string
 
 

astroquery/utils/tap/core.py

@@ -169,7 +169,8 @@ def load_table(self, table, verbose=False):
         """
         if table is None:
             raise ValueError("Table name is required")
-        print(f"Retrieving table '{table}'")
+        if verbose:
+            print(f"Retrieving table '{table}'")
         response = self.__connHandler.execute_tapget(f"tables?tables={table}",
                                                      verbose=verbose)
         if verbose:
@@ -903,7 +904,7 @@ def load_groups(self, verbose=False):
             print("Parsing groups...")
         gsp = GroupSaxParser()
         gsp.parseData(response)
-        print(f"Done. {len(gsp.get_groups())} groups found")
+        log.info(f"Done. {len(gsp.get_groups())} groups found")
         if verbose:
             for g in gsp.get_groups():
                 print(g.title)
@@ -958,7 +959,7 @@ def load_shared_items(self, verbose=False):
             print("Parsing shared items...")
         ssp = SharedItemsSaxParser()
         ssp.parseData(response)
-        print(f"Done. {len(ssp.get_shared_items())} shared items found")
+        log.info(f"Done. {len(ssp.get_shared_items())} shared items found")
         if verbose:
             for g in ssp.get_shared_items():
                 print(g.title)
@@ -1007,7 +1008,7 @@ def share_table(self, group_name=None,
                                                  verbose,
                                                  200)
         msg = f"Shared table '{table_name}' to group '{group_name}'."
-        print(msg)
+        log.info(msg)
 
     def share_table_stop(self, group_name=None, table_name=None,
                          verbose=False):
@@ -1055,7 +1056,7 @@ def share_table_stop(self, group_name=None, table_name=None,
                                                  200)
 
         msg = f"Stop sharing table '{table_name}' to group '{group_name}'."
-        print(msg)
+        log.info(msg)
 
     def share_group_create(self, group_name=None, description=None,
                            verbose=False):
@@ -1090,7 +1091,7 @@ def share_group_create(self, group_name=None, description=None,
                                                  verbose,
                                                  200)
         msg = f"Created group '{group_name}'."
-        print(msg)
+        log.info(msg)
 
     def share_group_delete(self,
                            group_name=None,
@@ -1119,7 +1120,7 @@ def share_group_delete(self,
                                                  verbose,
                                                  200)
         msg = f"Deleted group '{group_name}'."
-        print(msg)
+        log.info(msg)
 
     def share_group_add_user(self,
                              group_name=None,
@@ -1169,7 +1170,7 @@ def share_group_add_user(self,
                                                  verbose,
                                                  200)
         msg = f"Added user '{user_id}' from group '{group_name}'."
-        print(msg)
+        log.info(msg)
 
     def share_group_delete_user(self,
                                 group_name=None,
@@ -1220,7 +1221,7 @@ def share_group_delete_user(self,
                                                  verbose,
                                                  200)
         msg = f"Deleted user '{user_id}' from group '{group_name}'."
-        print(msg)
+        log.info(msg)
 
     def is_valid_user(self, user_id=None, verbose=False):
         """Determines if the specified user exists in the system
@@ -1367,7 +1368,7 @@ def remove_jobs(self, jobs_list, verbose=False):
                                                  verbose,
                                                  200)
         msg = f"Removed jobs: '{jobs_list}'."
-        print(msg)
+        log.info(msg)
 
     def __execLogin(self, usr, pwd, verbose=False):
         subContext = "login"
@@ -1428,10 +1429,10 @@ def upload_table(self, upload_resource=None, table_name=None,
             job.jobid = jobid
             job.name = 'Table upload'
             job.set_phase('EXECUTING')
-            print(f"Job '{jobid}' created to upload table '{table_name}'.")
+            log.info(f"Job '{jobid}' created to upload table '{table_name}'.")
             return job
         else:
-            print(f"Uploaded table '{table_name}'.")
+            log.info(f"Uploaded table '{table_name}'.")
             return None
 
     def __uploadTableMultipart(self, resource, table_name=None,
@@ -1445,7 +1446,7 @@ def __uploadTableMultipart(self, resource, table_name=None,
                 "TABLE_NAME": str(table_name),
                 "TABLE_DESC": str(table_description),
                 "FORMAT": 'votable'}
-            print("Sending pytable.")
+            log.info("Sending pytable.")
             fh = tempfile.NamedTemporaryFile(delete=False)
             resource.write(fh, format='votable')
             fh.close()
@@ -1462,7 +1463,7 @@ def __uploadTableMultipart(self, resource, table_name=None,
                     "TABLE_NAME": str(table_name),
                     "TABLE_DESC": str(table_description),
                     "FORMAT": str(resource_format)}
-                print(f"Sending file: {resource}")
+                log.info(f"Sending file: {resource}")
                 with open(resource, "r") as f:
                     chunk = f.read()
                 files = [['FILE', os.path.basename(resource), chunk]]
@@ -1524,7 +1525,7 @@ def upload_table_from_job(self, job=None, table_name=None,
                                            table_description=table_description,
                                            verbose=verbose)
         msg = f"Created table '{table_name}' from job: '{j.jobid}'."
-        print(msg)
+        log.info(msg)
 
     def __uploadTableMultipartFromJob(self, resource, table_name=None,
                                       table_description=None, verbose=False):
@@ -1581,7 +1582,7 @@ def delete_user_table(self, table_name=None, force_removal=False,
                                                  verbose,
                                                  200)
         msg = f"Table '{table_name}' deleted."
-        print(msg)
+        log.info(msg)
 
     def rename_table(self, table_name=None, new_table_name=None, new_column_names_dict=None,
                      verbose=False):
@@ -1742,7 +1743,7 @@ def update_user_table(self, table_name=None, list_of_changes=[],
                                                  verbose,
                                                  200)
         msg = f"Table '{table_name}' updated."
-        print(msg)
+        log.info(msg)
 
     @staticmethod
     def get_table_update_arguments(table_name, columns, list_of_changes):
@@ -1993,7 +1994,7 @@ def __dologin(self, verbose=False):
             if cookie is not None:
                 self.__isLoggedIn = True
                 connHandler.set_cookie(cookie)
-        print("OK")
+        log.info("OK")
 
     def logout(self, verbose=False):
         """Performs a logout

astroquery/utils/tap/model/job.py

@@ -20,6 +20,7 @@
 from astroquery.utils.tap.model import modelutils
 from astroquery.utils.tap.xmlparser import utils
 from astroquery.utils.tap import taputils
+from astropy.logger import log
 import requests
 
 
@@ -274,7 +275,7 @@ def save_results(self, verbose=False):
         else:
             if not self.async_:
                 # sync: cannot access server again
-                print("No results to save")
+                log.info("No results to save")
             else:
                 # Async
                 self.wait_for_job_end(verbose)
@@ -316,7 +317,7 @@ def wait_for_job_end(self, verbose=False):
         lphase = None
         # execute job if not running
         if self._phase == 'PENDING':
-            print("Job in PENDING phase, sending phase=RUN request.")
+            log.info("Job in PENDING phase, sending phase=RUN request.")
             try:
                 self.start(verbose)
             except Exception as ex:

astroquery/utils/tests/test_utils.py

@@ -13,6 +13,7 @@
 import astropy.units as u
 from astropy.table import Table
 import astropy.utils.data as aud
+from astropy.logger import log
 
 from ...utils import chunk_read, chunk_report, class_or_instance, commons
 from ...utils.process_asyncs import async_to_sync_docstr, async_to_sync
@@ -25,10 +26,10 @@ class SimpleQueryClass:
     def query(self):
         """ docstring """
         if self is SimpleQueryClass:
-            print("Calling query as class method")
+            log.info("Calling query as class method")
             return "class"
         else:
-            print("Calling query as instance method")
+            log.info("Calling query as instance method")
             return "instance"
 
 
@@ -381,7 +382,7 @@ def close(self):
             self.file.close()
 
     def monkey_urlopen(x, *args, **kwargs):
-        print("Monkeyed URLopen")
+        log.info("Monkeyed URLopen")
         return MockRemote(fitsfilepath, *args, **kwargs)
 
     def monkey_builder(tlscontext=None):
@@ -392,7 +393,7 @@ def monkey_builder(tlscontext=None):
     def monkey_urlrequest(x, *args, **kwargs):
         # urlrequest allows passing headers; this will just return the URL
         # because we're ignoring headers during mocked actions
-        print("Monkeyed URLrequest")
+        log.info("Monkeyed URLrequest")
         return x
 
     aud.urllib.request.Request = monkey_urlrequest