Merge branch 'master' into feature/document-licenses-addition

python-poetry · Oct 23, 2023 · 756413d · 756413d
2 parents 9a88d79 + c41e213
commit 756413d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/poetry/publishing/uploader.py b/src/poetry/publishing/uploader.py
@@ -77,7 +77,7 @@ def auth(self, username: str | None, password: str | None) -> None:
         self._password = password
 
     def make_session(self) -> requests.Session:
-        session = requests.session()
+        session = requests.Session()
         auth = self.get_auth()
         if auth is not None:
             session.auth = auth
@@ -106,10 +106,8 @@ def upload(
         if client_cert:
             session.cert = str(client_cert)
 
-        try:
+        with session:
             self._upload(session, url, dry_run, skip_existing)
-        finally:
-            session.close()
 
     def post_data(self, file: Path) -> dict[str, Any]:
         meta = Metadata.from_package(self._package)

diff --git a/src/poetry/repositories/pypi_repository.py b/src/poetry/repositories/pypi_repository.py
@@ -49,7 +49,7 @@ def __init__(
     def search(self, query: str) -> list[Package]:
         results = []
 
-        response = requests.session().get(
+        response = requests.get(
             self._base_url + "search", params={"q": query}, timeout=REQUESTS_TIMEOUT
         )
         parser = SearchResultParser()