summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/command/upload.py
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-01-09 00:15:45 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-01-09 00:15:45 (GMT)
commit13f7c3b6cad28ee57390c7650e1bf644f0b3943f (patch)
treef74d6310917922466929bc468f2d9ee64300d2be /Lib/distutils/command/upload.py
parentbcd5cbe01ef4306a82f85d0500f9a9f04113f804 (diff)
downloadcpython-13f7c3b6cad28ee57390c7650e1bf644f0b3943f.zip
cpython-13f7c3b6cad28ee57390c7650e1bf644f0b3943f.tar.gz
cpython-13f7c3b6cad28ee57390c7650e1bf644f0b3943f.tar.bz2
Merged revisions 68415 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r68415 | tarek.ziade | 2009-01-09 00:56:31 +0100 (Fri, 09 Jan 2009) | 1 line fixed #4394 make the storage of the password optional in .pypirc ........
Diffstat (limited to 'Lib/distutils/command/upload.py')
-rw-r--r--Lib/distutils/command/upload.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index 7ba7f58..020e860 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -48,6 +48,11 @@ class upload(PyPIRCCommand):
self.repository = config['repository']
self.realm = config['realm']
+ # getting the password from the distribution
+ # if previously set by the register command
+ if not self.password and self.distribution.password:
+ self.password = self.distribution.password
+
def run(self):
if not self.distribution.dist_files:
raise DistutilsOptionError("No dist file created in earlier command")