Skip to content

bpo-32155: Revert distutils.config change #4618

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

Merged
vstinner merged 2 commits into from
Nov 28, 2017
Merged

bpo-32155: Revert distutils.config change #4618

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
2d837bd
bpo-32155: Revert distutils.config change
vstinner Nov 28, 2017
3190fc5
Remove also the NEWS entry
vstinner Nov 28, 2017
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: 2 additions & 3 deletions Lib/distutils/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ def _read_pypirc(self):
if os.path.exists(rc):
self.announce('Using PyPI login from %s' % rc)
repository = self.repository or self.DEFAULT_REPOSITORY
realm = self.realm or self.DEFAULT_REALM

config = RawConfigParser()
config.read(rc)
Expand All @@ -77,7 +76,7 @@ def _read_pypirc(self):
# optional params
for key, default in (('repository',
self.DEFAULT_REPOSITORY),
('realm', realm),
('realm', self.DEFAULT_REALM),
('password', None)):
if config.has_option(server, key):
current[key] = config.get(server, key)
Expand Down Expand Up @@ -106,7 +105,7 @@ def _read_pypirc(self):
'password': config.get(server, 'password'),
'repository': repository,
'server': server,
'realm': realm}
'realm': self.DEFAULT_REALM}

return {}

Expand Down
1 change: 0 additions & 1 deletion Misc/NEWS.d/next/Library/2017-11-28-15-06-07.bpo-32155.hWHGww.rst
View file
Open in desktop

This file was deleted.