Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: user-agent python-requests #8394

Merged
merged 8 commits into from
Sep 11, 2023
Merged

bugfix: user-agent python-requests #8394

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2ade49d
bugfix: user-agent python-requests
mtricolici98 Sep 1, 2023
b380b76
bugfix: Handled none type exception
mtricolici98 Sep 4, 2023
7d28b62
Merge branch 'master' into master
mtricolici98 Sep 4, 2023
110943d
Moved header assignment to session creation.
mtricolici98 Sep 6, 2023
3946848
Merge remote-tracking branch 'refs/remotes/origin/master'
mtricolici98 Sep 6, 2023
9d35aeb
Made user_agent attribute private
mtricolici98 Sep 11, 2023
2b50dd1
Merge branch 'master' into master
mtricolici98 Sep 11, 2023
c9fd3b7
Merge branch 'master' into master
radoering Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/poetry/utils/authenticator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@

from cachecontrol import CacheControlAdapter
from cachecontrol.caches import FileCache
from requests_toolbelt import user_agent

from poetry.__version__ import __version__
from poetry.config.config import Config
from poetry.exceptions import PoetryException
from poetry.utils.constants import REQUESTS_TIMEOUT
Expand Down Expand Up @@ -193,7 +195,8 @@ def authenticated_url(self, url: str) -> str:
def request(
self, method: str, url: str, raise_for_status: bool = True, **kwargs: Any
) -> requests.Response:
headers = kwargs.get("headers")
headers = kwargs.get("headers", {}) or {}
Copy link
Contributor

@dimbleby dimbleby Sep 5, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or {} isn't doing anything useful

cf

poetry/src/poetry/publishing/uploader.py

Line 82 in 02448cf

session.headers["User-Agent"] = self.user_agent
, which does this on the session - it would be consistent here to do the work in create_session().

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think or {} covers the potential of there being a headers key in the dict with a None value.

I will apply the UA to the session itself. Thank you for the suggestion.

headers["User-agent"] = user_agent("poetry", __version__)
request = requests.Request(method, url, headers=headers)
credential = self.get_credentials_for_url(url)

Expand Down