aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command
diff options
context:
space:
mode:
Diffstat (limited to 'setuptools/command')
-rwxr-xr-xsetuptools/command/upload.py5
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