mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-13 15:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-32155: Revert distutils.config change (#4618)

Browse source 
Revert distutils changes of the commit
696b501cd1 and remove the realm
variable.
This commit is contained in:
Victor Stinner 2017-11-28 23:19:26 +01:00 • committed by GitHub
parent fe2d5babba
commit 71bd588646
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/distutils/config.py
View file

@ -51,7 +51,6 @@ class PyPIRCCommand(Command):
if os.path.exists(rc): if os.path.exists(rc):
self.announce('Using PyPI login from %s' % rc) self.announce('Using PyPI login from %s' % rc)
repository = self.repository or self.DEFAULT_REPOSITORY repository = self.repository or self.DEFAULT_REPOSITORY
realm = self.realm or self.DEFAULT_REALM
config = RawConfigParser() config = RawConfigParser()
config.read(rc) config.read(rc)
@ -77,7 +76,7 @@ class PyPIRCCommand(Command):
# optional params # optional params
for key, default in (('repository', for key, default in (('repository',
self.DEFAULT_REPOSITORY), self.DEFAULT_REPOSITORY),
('realm', realm), ('realm', self.DEFAULT_REALM),
('password', None)): ('password', None)):
if config.has_option(server, key): if config.has_option(server, key):
current[key] = config.get(server, key) current[key] = config.get(server, key)
@ -106,7 +105,7 @@ class PyPIRCCommand(Command):
'password': config.get(server, 'password'), 'password': config.get(server, 'password'),
'repository': repository, 'repository': repository,
'server': server, 'server': server,
'realm': realm} 'realm': self.DEFAULT_REALM}
return {} return {}

1
Misc/NEWS.d/next/Library/2017-11-28-15-06-07.bpo-32155.hWHGww.rst
View file

@ -1 +0,0 @@
Fix distutils.config: use the PyPIRCCommand.realm attribute if it is set.