From 77a763154aba7892e0b16266558b262cf3bfe04b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brigitta=20Sip=C5=91cz?= Date: Fri, 9 Aug 2024 10:36:14 -0700 Subject: [PATCH] COMP: fix tarfile deprecation for esasky, follow-up to PR2838 --- astroquery/esasky/core.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/astroquery/esasky/core.py b/astroquery/esasky/core.py index 1889864aa1..fe5e71a150 100644 --- a/astroquery/esasky/core.py +++ b/astroquery/esasky/core.py @@ -2,7 +2,7 @@ import json import os -import tarfile +import tarfile as esatar import sys import re import warnings @@ -27,6 +27,12 @@ from astropy.coordinates.name_resolve import sesame_database +# We do trust the ESA tar files, this is to avoid the new to Python 3.12 deprecation warning +# https://docs.python.org/3.12/library/tarfile.html#tarfile-extraction-filter +if hasattr(esatar, "fully_trusted_filter"): + esatar.TarFile.extraction_filter = staticmethod(esatar.fully_trusted_filter) + + @async_to_sync class ESASkyClass(BaseQuery): @@ -1526,7 +1532,7 @@ def _get_maps_for_mission(self, maps_table, mission, download_dir, cache, json, if file_name == "": file_name = self._extract_file_name_from_url(product_url) if file_name.lower().endswith(self.__TAR_STRING): - with tarfile.open(fileobj=BytesIO(response.content)) as tar: + with esatar.open(fileobj=BytesIO(response.content)) as tar: for member in tar.getmembers(): tar.extract(member, directory_path) maps.append(self._open_fits(Path(directory_path, member.name), verbose=verbose)) @@ -1574,7 +1580,7 @@ def _get_herschel_map(self, product_url, directory_path, cache, verbose=False): stream=True, headers=self._get_header()) response.raise_for_status() - with tarfile.open(fileobj=BytesIO(response.content)) as tar: + with esatar.open(fileobj=BytesIO(response.content)) as tar: for member in tar.getmembers(): member_name = member.name.lower() if 'hspire' in member_name or 'hpacs' in member_name: @@ -1592,7 +1598,7 @@ def _get_herschel_spectra(self, product_url, directory_path, cache, verbose=Fals response.raise_for_status() - with tarfile.open(fileobj=BytesIO(response.content)) as tar: + with esatar.open(fileobj=BytesIO(response.content)) as tar: for member in tar.getmembers(): member_name = member.name.lower() if ('hspire' in member_name or 'hpacs' in member_name