diff options
| -rwxr-xr-x | pkg_resources.txt | 2 | ||||
| -rwxr-xr-x | setuptools/command/upload.py | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkg_resources.txt b/pkg_resources.txt index 55d275a8..711cdd3b 100755 --- a/pkg_resources.txt +++ b/pkg_resources.txt @@ -625,7 +625,7 @@ addition, the following methods are provided: ``__str__()`` The string form of an ``EntryPoint`` is a string that could be passed to - ``EntryPoint.parse()`` to yield an equivalent ``EntryPoint``. + ``EntryPoint.parse()`` to produce an equivalent ``EntryPoint``. ``Distribution`` Objects diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py index 4aa73cd1..94190c2a 100755 --- a/setuptools/command/upload.py +++ b/setuptools/command/upload.py @@ -73,12 +73,9 @@ class upload(Command): # Fill in the data content = open(filename,'rb').read() basename = os.path.basename(filename) - if basename.endswith('.egg'): - basename += '.zip' comment = '' - if command=='bdist_egg': - command='sdist' - comment='Binary egg for use with setuptools' + if command=='bdist_egg' and self.distribution.has_ext_modules(): + comment = "built on %s" % platform.platform(terse=1) data = { ':action':'file_upload', 'protcol_version':'1', |