diff options
| author | Guy Rozendorn (guyr@infinidat.com) <Guy Rozendorn (guyr@infinidat.com)> | 2011-10-07 18:55:31 +0200 |
|---|---|---|
| committer | Guy Rozendorn (guyr@infinidat.com) <Guy Rozendorn (guyr@infinidat.com)> | 2011-10-07 18:55:31 +0200 |
| commit | 257f23372a797ede9e14ae3e62c8319896943857 (patch) | |
| tree | f926af6fef37f1ad92fbda477131ed694375863a /setuptools/command/upload.py | |
| parent | 837d8866a41ffe9d035b65361513ab06dc964a27 (diff) | |
| download | external_python_setuptools-257f23372a797ede9e14ae3e62c8319896943857.tar.gz external_python_setuptools-257f23372a797ede9e14ae3e62c8319896943857.tar.bz2 external_python_setuptools-257f23372a797ede9e14ae3e62c8319896943857.zip | |
Revert 8d1cb51a01b6 because of issue #250
--HG--
branch : distribute
extra : rebase_source : 842a0d796e6e3cd5ecf312dd5c3ff2bb35d601a5
Diffstat (limited to 'setuptools/command/upload.py')
| -rwxr-xr-x | setuptools/command/upload.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py index 1b708943..f2e0b2e1 100755 --- a/setuptools/command/upload.py +++ b/setuptools/command/upload.py @@ -228,10 +228,7 @@ if sys.version >= "2.5": current[key] = config.get(server, key) else: current[key] = default - # Issue #246, handling url ambiguity - if (current['server'] == repository or - current['repository'] == repository or - (current['repository'] == "http://www.python.org/pypi" and repository == self.DEFAULT_REPOSITORY)): + if (current['server'] == repository: return current elif 'server-login' in sections: # old format |