Merge pull request #2522 from bsipocz/TST_closing_files

bsipocz · web-flow · commit a750c432d600 · 2022-09-11T16:23:44.000-07:00
TST: Closing files in tests
diff --git a/astroquery/alfalfa/tests/test_alfalfa.py b/astroquery/alfalfa/tests/test_alfalfa.py
@@ -49,7 +49,8 @@ def get_readable_fileobj_mockreturn(filename, **kwargs):
 
 def get_mockreturn(url, params=None, timeout=10):
     filename = data_path(DATA_FILES['catalog'])
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponseAlfalfa(content)
 
 
diff --git a/astroquery/besancon/tests/test_besancon.py b/astroquery/besancon/tests/test_besancon.py
@@ -80,7 +80,8 @@ def get_readable_fileobj_mockreturn(filename, **kwargs):
 
 def post_mockreturn(method, url, data, timeout=10, stream=True, **kwargs):
     filename = data_path('query_return.iframe.html')
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponseBesancon(content, filename, **kwargs)
 
 
diff --git a/astroquery/casda/tests/test_casda.py b/astroquery/casda/tests/test_casda.py
@@ -83,7 +83,8 @@ def get_mockreturn(self, method, url, data=None, timeout=10,
         key = params['POS'].split()[0] if params['POS'] else None
     filename = data_path(DATA_FILES[key])
     log.debug('providing ' + filename)
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content)
 
 
diff --git a/astroquery/cds/tests/test_mocserver.py b/astroquery/cds/tests/test_mocserver.py
@@ -41,7 +41,8 @@ def patch_get(request):
 def get_mockreturn(self, method, url, data=None, timeout=10,
                    files=None, params=None, headers=None, **kwargs):
     filename = data_path(DATA_FILES[data])
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content)
 
 
diff --git a/astroquery/heasarc/tests/parametrization.py b/astroquery/heasarc/tests/parametrization.py
@@ -52,7 +52,8 @@ def get_mockreturn(session, method, url, params=None, timeout=10, **kwargs):
 
     filename = filename_for_request(url, params)
     try:
-        content = open(filename, "rt").read()
+        with open(filename, 'rt') as infile:
+            content = infile.read()
     except FileNotFoundError:
         log.error(
             f'no stored mock data in {filename} for url="{url}" and params="{params}", '
diff --git a/astroquery/image_cutouts/first/tests/test_first.py b/astroquery/image_cutouts/first/tests/test_first.py
@@ -35,7 +35,8 @@ def patch_post(request):
 
 def post_mockreturn(method, url, data, timeout, **kwargs):
     filename = data_path(DATA_FILES['image'])
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content, **kwargs)
 
 
diff --git a/astroquery/ipac/irsa/ibe/tests/test_ibe.py b/astroquery/ipac/irsa/ibe/tests/test_ibe.py
@@ -56,7 +56,8 @@ def get_mockreturn(self, method, url,
                    json=None):
     filename = data_path(DATA_FILES[(url,
                                      params and frozenset(params.items()))])
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(
         content, url=url, headers=headers, stream=stream, auth=auth)
 
diff --git a/astroquery/ipac/irsa/sha/tests/test_sha.py b/astroquery/ipac/irsa/sha/tests/test_sha.py
@@ -35,7 +35,8 @@ def get_mockreturn(url, params=None, stream=False, timeout=10, **kwargs):
     else:
         raise ValueError("Query not pre-loaded.")
 
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content, **kwargs)
 
 
diff --git a/astroquery/ipac/irsa/tests/test_irsa.py b/astroquery/ipac/irsa/tests/test_irsa.py
@@ -38,7 +38,8 @@ def patch_get(request):
 
 def get_mockreturn(method, url, params=None, timeout=10, cache=False, **kwargs):
     filename = data_path(DATA_FILES[params['spatial']])
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content, **kwargs)
 
 
diff --git a/astroquery/ipac/ned/tests/test_ned.py b/astroquery/ipac/ned/tests/test_ned.py
@@ -69,7 +69,8 @@ def get_mockreturn(method, url, params=None, timeout=10, **kwargs):
         filename = data_path(DATA_FILES['extract_urls'])
     else:
         filename = data_path(DATA_FILES['object'])
-    content = open(filename, "rb").read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content, **kwargs)
 
 
@@ -261,7 +262,8 @@ def test_get_object_notes(patch_get):
 
 
 def test_parse_result(capsys):
-    content = open(data_path(DATA_FILES['error']), 'rb').read()
+    with open(data_path(DATA_FILES['error']), 'rb') as infile:
+        content = infile.read()
     response = MockResponse(content)
     with pytest.raises(RemoteServiceError) as exinfo:
         ned.core.Ned._parse_result(response)
diff --git a/astroquery/magpis/tests/test_magpis.py b/astroquery/magpis/tests/test_magpis.py
@@ -38,7 +38,8 @@ def patch_post(request):
 
 def post_mockreturn(method, url, data, timeout, **kwargs):
     filename = data_path(DATA_FILES['image'])
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content, **kwargs)
 
 
diff --git a/astroquery/mast/tests/test_mast.py b/astroquery/mast/tests/test_mast.py
@@ -99,7 +99,8 @@ def post_mockreturn(self, method="POST", url=None, data=None, timeout=10, **kwar
     if ("Filtered" in service) and (re.search(r"COUNT_BIG%28%2A%29", data)):
         service = "Counts"
     filename = data_path(DATA_FILES[service])
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
 
     # returning as list because this is what the mast _request function does
     return [MockResponse(content)]
@@ -122,13 +123,15 @@ def service_mockreturn(self, method="POST", url=None, data=None, timeout=10, use
         filename = data_path(DATA_FILES["mission_incorrect_results"])
     elif use_json:
         filename = data_path(DATA_FILES["mission_search_results"])
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content)
 
 
 def resolver_mockreturn(*args, **kwargs):
     filename = data_path(DATA_FILES["Mast.Name.Lookup"])
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content)
 
 
@@ -159,7 +162,8 @@ def tesscut_get_mockreturn(method="GET", url=None, data=None, timeout=10, **kwar
     else:
         filename = data_path(DATA_FILES['tess_cutout'])
 
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content)
 
 
diff --git a/astroquery/mpc/tests/test_mpc.py b/astroquery/mpc/tests/test_mpc.py
@@ -93,15 +93,19 @@ def patch_get(request):
 
 
 def get_mockreturn(self, httpverb, url, params={}, auth=None, **kwargs):
+    filename = None
+
     if mpc.core.MPC.MPC_URL in url:
-        content = open(data_path('comet_object_C2012S1.json'), 'rb').read()
+        filename = 'comet_object_C2012S1.json'
     elif url == mpc.core.MPC.OBSERVATORY_CODES_URL:
-        content = open(data_path('ObsCodes.html'), 'rb').read()
+        filename = 'ObsCodes.html'
     elif mpc.core.MPC.MPCOBS_URL in url:
-        content = open(data_path('mpc_obs.dat'), 'rb').read()
+        filename = 'mpc_obs.dat'
     else:
         content = None
-
+    if filename:
+        with open(data_path(filename), 'rb') as infile:
+            content = infile.read()
     return MockResponse(content, url=url, auth=auth)
 
 
@@ -110,7 +114,8 @@ def post_mockreturn(self, httpverb, url, data={}, **kwargs):
         prefix = data['TextArea'].replace(' ', '')
         suffix = '-'.join((data['c'], data['raty'], data['s']))
         filename = data_path('{}_ephemeris_{}.html'.format(prefix, suffix))
-        content = open(filename, 'rb').read()
+        with open(filename, 'rb') as infile:
+            content = infile.read()
     else:
         content = None
 
diff --git a/astroquery/nasa_ads/tests/test_nasaads.py b/astroquery/nasa_ads/tests/test_nasaads.py
@@ -40,7 +40,8 @@ def patch_get(request):
 def get_mockreturn(method='GET', url=None, headers=None, timeout=10,
                    **kwargs):
     filename = data_path('test_text.txt')
-    content = open(filename, 'r').read()
+    with open(filename, 'r') as infile:
+        content = infile.read()
 
     return MockResponseADS(content=content)
 
diff --git a/astroquery/nist/tests/test_nist.py b/astroquery/nist/tests/test_nist.py
@@ -27,7 +27,8 @@ def patch_get(request):
 
 def get_mockreturn(method, url, params=None, timeout=10, **kwargs):
     filename = data_path(DATA_FILES['lines'])
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content, **kwargs)
 
 
diff --git a/astroquery/nrao/tests/test_nrao.py b/astroquery/nrao/tests/test_nrao.py
@@ -56,7 +56,8 @@ def post_mockreturn(self, method, url, data=None, timeout=10, files=None,
     else:
         raise NotImplementedError("Test type not implemented")
 
-    content = open(filename, "rb").read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content, **kwargs)
 
 
diff --git a/astroquery/nvas/tests/test_nvas.py b/astroquery/nvas/tests/test_nvas.py
@@ -48,7 +48,8 @@ def parse_coordinates_mock_return(c):
 
 def post_mockreturn(method, url, data, timeout, **kwargs):
     filename = data_path(DATA_FILES['image_search'])
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     response = MockResponse(content, **kwargs)
     return response
 
diff --git a/astroquery/oac/tests/test_oac.py b/astroquery/oac/tests/test_oac.py
@@ -39,7 +39,8 @@ def get_mockreturn(method="GET", url=None, data=None, timeout=60, cache=True,
         file_key = 'single_spec'
     else:
         file_key = 'multi_spec'
-    content = open(data_path(DATA_FILES[file_key]), 'rb').read()
+    with open(data_path(DATA_FILES[file_key]), 'rb') as infile:
+        content = infile.read()
     response = MockResponse(content, **kwargs)
     return response
 
diff --git a/astroquery/ogle/tests/test_ogle.py b/astroquery/ogle/tests/test_ogle.py
@@ -25,7 +25,8 @@ def patch_post(request):
 
 def post_mockreturn(method, url, data, timeout, files=None, **kwargs):
     if files is not None:
-        content = open(data_path(DATA_FILES['gal_0_3']), 'rb').read()
+        with open(data_path(DATA_FILES['gal_0_3']), 'rb') as infile:
+            content = infile.read()
         response = MockResponse(content, **kwargs)
     else:
         raise ValueError("Unsupported post request.")
diff --git a/astroquery/sdss/tests/test_sdss.py b/astroquery/sdss/tests/test_sdss.py
@@ -37,7 +37,10 @@ def mockreturn(method, url, **kwargs):
             filename = data_path(DATA_FILES['spectra_id'])
         else:
             filename = data_path(DATA_FILES['images_id'])
-        content = open(filename, 'rb').read()
+
+        with open(filename, 'rb') as infile:
+            content = infile.read()
+
         return MockResponse(content, url)
 
     mp = request.getfixturevalue("monkeypatch")
@@ -64,9 +67,11 @@ def get_readable_fileobj_mockreturn(filename, **kwargs):
         file_obj = data_path(DATA_FILES['spectra'])  # TODO: add images option
         encoding = kwargs.get('encoding', None)
         if encoding == 'binary':
-            yield open(file_obj, 'rb')
+            with open(file_obj, 'rb') as infile:
+                yield infile
         else:
-            yield open(file_obj, 'r', encoding=encoding)
+            with open(file_obj, 'r', encoding=encoding) as infile:
+                yield infile
 
     mp = request.getfixturevalue("monkeypatch")
 
@@ -148,9 +153,9 @@ def compare_xid_data(xid, data):
 def image_tester(images, filetype):
     """Test that an image/spectrum is our fake data."""
     assert type(images) == list
-    data = fits.open(data_path(DATA_FILES[filetype]))
-    assert images[0][0].header == data[0].header
-    assert images[0][0].data == data[0].data
+    with fits.open(data_path(DATA_FILES[filetype])) as data:
+        assert images[0][0].header == data[0].header
+        assert images[0][0].data == data[0].data
 
 
 @pytest.mark.parametrize("dr", dr_list)
diff --git a/astroquery/simbad/tests/test_simbad.py b/astroquery/simbad/tests/test_simbad.py
@@ -47,7 +47,8 @@ def get_content(self, script):
         match = self.query_regex.search(script)
         if match:
             filename = DATA_FILES[match.group(1)]
-            content = open(data_path(filename), "rb").read()
+            with open(data_path(filename), "rb") as infile:
+                content = infile.read()
             return content
 
 
diff --git a/astroquery/splatalogue/tests/test_splatalogue.py b/astroquery/splatalogue/tests/test_splatalogue.py
@@ -30,7 +30,8 @@ def post_mockreturn(self, method, url, data=None, timeout=10, files=None,
     if method != 'POST':
         raise ValueError("A 'post request' was made with method != POST")
     filename = data_path(SPLAT_DATA)
-    content = open(filename, "rb").read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content, **kwargs)
 
 
diff --git a/astroquery/svo_fps/tests/test_svo_fps.py b/astroquery/svo_fps/tests/test_svo_fps.py
@@ -43,7 +43,8 @@ def get_mockreturn(method, url, params=None, timeout=10, cache=None, **kwargs):
     else:
         raise NotImplementedError("Test type not implemented")
 
-    content = open(filename, 'rb').read()
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content, **kwargs)
 
 
diff --git a/astroquery/ukidss/tests/test_ukidss.py b/astroquery/ukidss/tests/test_ukidss.py
@@ -79,8 +79,8 @@ def get_mockreturn(method='GET', url='default_url',
         url = "error.html"
     else:
         raise ValueError("Mismatch: no test made for specified URL")
-
-    content = open(data_path(filename), "rb").read()
+    with open(data_path(filename), "rb") as infile:
+        content = infile.read()
     return MockResponse(content=content, url=url, **kwargs)
 
 
diff --git a/astroquery/vizier/tests/test_vizier.py b/astroquery/vizier/tests/test_vizier.py
@@ -48,11 +48,12 @@ def post_mockreturn(self, method, url, data=None, timeout=10, files=None,
     if '-source' in datad:
         # a request for the actual data
         filename = data_path(VO_DATA[datad['-source']])
-        content = open(filename, "rb").read()
     elif '-words' in datad:
         # a find_catalog request/only metadata
         filename = data_path(VO_DATA['find_' + datad['-words']])
-        content = open(filename, "rb").read()
+
+    with open(filename, 'rb') as infile:
+        content = infile.read()
     return MockResponse(content, **kwargs)
 
 
@@ -93,8 +94,8 @@ def test_parse_angle_err():
 @pytest.mark.parametrize(('filepath'),
                          list(set(VO_DATA.values())))
 def test_parse_result_verbose(filepath, capsys):
-    with open(data_path(filepath), 'rb') as f:
-        table_contents = f.read()
+    with open(data_path(filepath), 'rb') as infile:
+        table_contents = infile.read()
     response = MockResponse(table_contents)
     vizier.core.Vizier._parse_result(response)
     out, err = capsys.readouterr()
@@ -108,7 +109,8 @@ def test_parse_result_verbose(filepath, capsys):
                           ]
                          )  # TODO: 1->50 because it is just 1 table
 def test_parse_result(filepath, objlen):
-    table_contents = open(data_path(filepath), 'rb').read()
+    with open(data_path(filepath), 'rb') as infile:
+        table_contents = infile.read()
     response = MockResponse(table_contents)
     result = vizier.core.Vizier._parse_result(response)
     assert isinstance(result, commons.TableList)
diff --git a/docs/testing.rst b/docs/testing.rst
@@ -69,7 +69,8 @@ object within the ``MockResponse`` class:
 
     def get_mockreturn(url, params=None, timeout=10):
         filename = data_path(DATA_FILES['votable'])
-        content = open(filename, 'r').read()
+        with open(filename, 'r') as infile:
+            content = infile.read()
         return MockResponse(content)
 
 ``data_path`` is a simple function that looks for the ``data`` directory local to
diff --git a/setup.cfg b/setup.cfg
@@ -40,7 +40,6 @@ filterwarnings =
     ignore:distutils Version classes are deprecated:DeprecationWarning
     ignore::pytest.PytestUnraisableExceptionWarning
     ignore::numpy.VisibleDeprecationWarning
-    ignore: unclosed file:ResourceWarning
     ignore:unclosed <ssl.SSLSocket:ResourceWarning
     ignore::UserWarning
     ignore::astroquery.exceptions.InputWarning
