fix: close response files correctly

Signed-off-by: Frost Ming <[email protected]>
frostming · Aug 3, 2023 · b3ee827 · b3ee827
1 parent f0aea16
commit b3ee827
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/src/unearth/evaluator.py b/src/unearth/evaluator.py
@@ -257,10 +257,10 @@ def evaluate_package(
 
 
 def _get_hash(link: Link, hash_name: str, session: Session) -> str:
-    resp = session.get(link.normalized, stream=True)
     hasher = hashlib.new(hash_name)
-    for chunk in resp.iter_content(chunk_size=1024 * 8):
-        hasher.update(chunk)
+    with session.get(link.normalized, stream=True) as resp:
+        for chunk in resp.iter_content(chunk_size=1024 * 8):
+            hasher.update(chunk)
     digest = hasher.hexdigest()
     if not link.hashes:
         link.hashes = {}

diff --git a/src/unearth/preparer.py b/src/unearth/preparer.py
@@ -297,21 +297,21 @@ def unpack_link(
         # A remote artfiact link, check the download dir first
         artifact = download_dir / link.filename
         if not _check_downloaded(artifact, hashes):
-            resp = session.get(link.normalized, stream=True)
-            try:
-                resp.raise_for_status()
-            except HTTPError as e:
-                raise UnpackError(f"Download failed: {e}") from None
-            if getattr(resp, "from_cache", False):
-                logger.info("Using cached %s", link)
-            else:
-                size = format_size(resp.headers.get("Content-Length", ""))
-                logger.info("Downloading %s (%s)", link, size)
-            with artifact.open("wb") as f:
-                for chunk in resp.iter_content(chunk_size=READ_CHUNK_SIZE):
-                    if chunk:
-                        validator.update(chunk)
-                        f.write(chunk)
+            with session.get(link.normalized, stream=True) as resp:
+                try:
+                    resp.raise_for_status()
+                except HTTPError as e:
+                    raise UnpackError(f"Download failed: {e}") from None
+                if getattr(resp, "from_cache", False):
+                    logger.info("Using cached %s", link)
+                else:
+                    size = format_size(resp.headers.get("Content-Length", ""))
+                    logger.info("Downloading %s (%s)", link, size)
+                with artifact.open("wb") as f:
+                    for chunk in resp.iter_content(chunk_size=READ_CHUNK_SIZE):
+                        if chunk:
+                            validator.update(chunk)
+                            f.write(chunk)
             validator.validate()
     if link.is_wheel:
         if link.is_file: