summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2017-11-28 23:19:26 +0100
committerGitHub <noreply@github.com>2017-11-28 23:19:26 +0100
commit3c144a62210850ec965d8ebf81c0bad9558e18b0 (patch)
tree61536a8f009770d4af5e6148e9374e0415f920d6
parentf7194b879e22a498a573d277fbcb3b9226412f89 (diff)
downloadpython-setuptools-git-3c144a62210850ec965d8ebf81c0bad9558e18b0.tar.gz
bpo-32155: Revert distutils.config change (#4618)
Revert distutils changes of the commit 696b501cd11dc429a0f661adeb598bfaf89e4112 and remove the realm variable.
-rw-r--r--config.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/config.py b/config.py
index e66d103f..2171abd6 100644
--- a/config.py
+++ b/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 {}