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

Jump to bottom

Log where upload configuration is being loaded from #674

Closed
wants to merge 2 commits into from
Closed

Log where upload configuration is being loaded from #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfc2b66
Log config location
Jul 15, 2020
5758261
Fixed status_code test in test_utils
Jul 16, 2020
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
9 changes: 4 additions & 5 deletions tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,11 +289,10 @@ def test_check_status_code_for_missing_status_code(capsys, repo_url):
captured = capsys.readouterr()
assert captured.out == "Content received from server:\nForbidden\n"

with pytest.raises(requests.HTTPError):
utils.check_status_code(response, False)

captured = capsys.readouterr()
assert captured.out == "NOTE: Try --verbose to see response content.\n"
if verbose:
assert "Content received from server:\nForbidden\n" in captured.out
else:
assert captured.out == "NOTE: Try --verbose to see response content.\n"


@pytest.mark.parametrize(
Expand Down
2 changes: 2 additions & 0 deletions twine/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ def get_config(path: str = "~/.pypirc") -> Dict[str, RepositoryConfig]:
# Expand user strings in the path
path = os.path.expanduser(path)

logger.info("Config Location: " + path)
Copy link
Member

Choose a reason for hiding this comment

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

In the last PR we were using fstrings. Here we're concatenating strings. Why don't we just let the stdlib log formatter format strings for us appropriately and why can't we be consistent?

Copy link

Choose a reason for hiding this comment

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

thought this discussion could help: pylint-dev/pylint#1788

pylint raises a warning on string interpolation during logging, the argument is it is `it is inefficient to compute the string for a log message that won't be logged.'

but f-string is more readable.

Copy link
Member

Choose a reason for hiding this comment

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

@snjypl that contributes nothing to the fact that there's no consistency in this project at the current moment and we should trend towards something consistent.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@sigmavirus24 Do you think that we should convert log messages to follow stdlib's log formatter format strings or stick with f-strings? Sorry about the inconsistency, I will keep that in mind moving forward. Thanks for the help.

Copy link
Member

Choose a reason for hiding this comment

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

Personally I prefer letting the logger do the interpolation, but my primary concern is consistency

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'm going to stick with f-strings for now then because that's what Twine uses for other output(such as the skip message).


# Parse the rc file
if os.path.isfile(path):
parser.read(path)
Expand Down