diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-11-28 22:19:26 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-28 22:19:26 (GMT) |
| commit | 71bd588646b282c9eebc390b31184a5bdb54e712 (patch) | |
| tree | d1b722a5ebd2570949c2839fa25426fe32900372 /Lib/distutils | |
| parent | fe2d5babba5d26de2093b6518316b268488187be (diff) | |
| download | cpython-71bd588646b282c9eebc390b31184a5bdb54e712.zip cpython-71bd588646b282c9eebc390b31184a5bdb54e712.tar.gz cpython-71bd588646b282c9eebc390b31184a5bdb54e712.tar.bz2 | |
bpo-32155: Revert distutils.config change (#4618)
Revert distutils changes of the commit
696b501cd11dc429a0f661adeb598bfaf89e4112 and remove the realm
variable.
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/config.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/distutils/config.py b/Lib/distutils/config.py index e66d103..2171abd 100644 --- a/Lib/distutils/config.py +++ b/Lib/distutils/config.py @@ -51,7 +51,6 @@ class PyPIRCCommand(Command): 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) @@ -77,7 +76,7 @@ class PyPIRCCommand(Command): # 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) @@ -106,7 +105,7 @@ class PyPIRCCommand(Command): 'password': config.get(server, 'password'), 'repository': repository, 'server': server, - 'realm': realm} + 'realm': self.DEFAULT_REALM} return {} |